@@ -118,19 +118,16 @@ const ObjectPage = forwardRef<ObjectPageDomRef, ObjectPagePropTypes>((props, ref
118118 const [ headerCollapsedInternal , setHeaderCollapsedInternal ] = useState < undefined | boolean > ( undefined ) ;
119119 const [ scrolledHeaderExpanded , setScrolledHeaderExpanded ] = useState ( false ) ;
120120 const [ sectionSpacer , setSectionSpacer ] = useState ( 0 ) ;
121- const [ currentTabModeSection , setCurrentTabModeSection ] = useState ( null ) ;
121+ const currentTabModeSection = useMemo (
122+ ( ) => ( mode === ObjectPageMode . IconTabBar ? getSectionById ( children , internalSelectedSectionId ) : null ) ,
123+ [ mode , children , internalSelectedSectionId ] ,
124+ ) ;
122125 const [ toggledCollapsedHeaderWasVisible , setToggledCollapsedHeaderWasVisible ] = useState ( false ) ;
123126 const sections = mode === ObjectPageMode . IconTabBar ? currentTabModeSection : children ;
124127 const scrollEndHandler = useOnScrollEnd ( { objectPageRef, setTabSelectId } ) ;
125128 // only required for IconTabBar mode
126129 const [ wasUserSectionChange , setWasUserSectionChange ] = useState ( false ) ;
127130
128- useEffect ( ( ) => {
129- const currentSection =
130- mode === ObjectPageMode . IconTabBar ? getSectionById ( children , internalSelectedSectionId ) : null ;
131- setCurrentTabModeSection ( currentSection ) ;
132- } , [ mode , children , internalSelectedSectionId ] ) ;
133-
134131 const onSelectedSectionChangeRef = useRef ( onSelectedSectionChange ) ;
135132 const onToggleHeaderAreaRef = useRef ( onToggleHeaderArea ) ;
136133 const onScrollRef = useRef ( rest . onScroll ) ;
0 commit comments