Giants manager Bruce Bochy made it clear Huff would play left field when he's ready, leaving Nate Schierholtz fighting for playing time.
"If he's ready to go, we'll activate him," Bochy said of Huff. "Left field is the plan for him right now. It's a matter of when we think he's ready and when he feels he's ready."
Huff has been dealing with anxiety disorder but looked to be in good spirits around the clubhouse before Saturday's game with the Milwaukee Brewers. He's also been participating in baseball-related activities.
Schierholtz, mired in a 1-for-24 slump over his last 10 games, still has the support of Bochy.
"He's going through his own little something right now, but he's going to find his way back in the lineup," Bochy said. "I know he will."
Schierholtz has seen his batting average melt to .254 from a season-high .372 following a pair of three-hit games during a doubleheader in New York on April 23.