yuken 4 лет назад
Родитель
Сommit
3a9f9c1510

+ 3 - 3
packages/app/src/components/CustomNavigation/CustomNav.jsx

@@ -88,7 +88,7 @@ export const CustomNavTab = (props) => {
   const [sliderMarginLeft, setSliderMarginLeft] = useState(0);
   const [sliderMarginLeft, setSliderMarginLeft] = useState(0);
 
 
   const {
   const {
-    activeTab, navTabMapping, onNavSelected, hideBorderBottom, breakpointToHideInactiveTabsDown, emptyTrashButton,
+    activeTab, navTabMapping, onNavSelected, hideBorderBottom, breakpointToHideInactiveTabsDown, navRightElement,
   } = props;
   } = props;
 
 
   const navTabRefs = useMemo(() => {
   const navTabRefs = useMemo(() => {
@@ -170,7 +170,7 @@ export const CustomNavTab = (props) => {
             );
             );
           })}
           })}
         </Nav>
         </Nav>
-        {emptyTrashButton}
+        {navRightElement}
       </div>
       </div>
       <hr className="my-0 grw-nav-slide-hr border-none" style={{ width: `${sliderWidth}%`, marginLeft: `${sliderMarginLeft}%` }} />
       <hr className="my-0 grw-nav-slide-hr border-none" style={{ width: `${sliderWidth}%`, marginLeft: `${sliderMarginLeft}%` }} />
       { !hideBorderBottom && <hr className="my-0 border-top-0 border-bottom" /> }
       { !hideBorderBottom && <hr className="my-0 border-top-0 border-bottom" /> }
@@ -185,7 +185,7 @@ CustomNavTab.propTypes = {
   onNavSelected: PropTypes.func,
   onNavSelected: PropTypes.func,
   hideBorderBottom: PropTypes.bool,
   hideBorderBottom: PropTypes.bool,
   breakpointToHideInactiveTabsDown: PropTypes.oneOf(['xs', 'sm', 'md', 'lg', 'xl']),
   breakpointToHideInactiveTabsDown: PropTypes.oneOf(['xs', 'sm', 'md', 'lg', 'xl']),
-  emptyTrashButton: PropTypes.element,
+  navRightElement: PropTypes.node,
 };
 };
 
 
 CustomNavTab.defaultProps = {
 CustomNavTab.defaultProps = {

+ 3 - 3
packages/app/src/components/CustomNavigation/CustomNavAndContents.jsx

@@ -8,7 +8,7 @@ import CustomTabContent from './CustomTabContent';
 
 
 const CustomNavAndContents = (props) => {
 const CustomNavAndContents = (props) => {
   const {
   const {
-    navTabMapping, defaultTabIndex, navigationMode, tabContentClasses, breakpointToHideInactiveTabsDown, emptyTrashButton,
+    navTabMapping, defaultTabIndex, navigationMode, tabContentClasses, breakpointToHideInactiveTabsDown, navRightElement,
   } = props;
   } = props;
   const [activeTab, setActiveTab] = useState(Object.keys(props.navTabMapping)[defaultTabIndex || 0]);
   const [activeTab, setActiveTab] = useState(Object.keys(props.navTabMapping)[defaultTabIndex || 0]);
 
 
@@ -32,7 +32,7 @@ const CustomNavAndContents = (props) => {
         navTabMapping={navTabMapping}
         navTabMapping={navTabMapping}
         onNavSelected={setActiveTab}
         onNavSelected={setActiveTab}
         breakpointToHideInactiveTabsDown={breakpointToHideInactiveTabsDown}
         breakpointToHideInactiveTabsDown={breakpointToHideInactiveTabsDown}
-        emptyTrashButton={emptyTrashButton}
+        navRightElement={navRightElement}
       />
       />
       <CustomTabContent activeTab={activeTab} navTabMapping={navTabMapping} additionalClassNames={tabContentClasses} />
       <CustomTabContent activeTab={activeTab} navTabMapping={navTabMapping} additionalClassNames={tabContentClasses} />
     </>
     </>
@@ -45,7 +45,7 @@ CustomNavAndContents.propTypes = {
   navigationMode: PropTypes.oneOf(['both', 'tab', 'dropdown']),
   navigationMode: PropTypes.oneOf(['both', 'tab', 'dropdown']),
   tabContentClasses: PropTypes.arrayOf(PropTypes.string),
   tabContentClasses: PropTypes.arrayOf(PropTypes.string),
   breakpointToHideInactiveTabsDown: PropTypes.oneOf(['xs', 'sm', 'md', 'lg', 'xl']),
   breakpointToHideInactiveTabsDown: PropTypes.oneOf(['xs', 'sm', 'md', 'lg', 'xl']),
-  emptyTrashButton: PropTypes.element,
+  navRightElement: PropTypes.node,
 };
 };
 CustomNavAndContents.defaultProps = {
 CustomNavAndContents.defaultProps = {
   navigationMode: 'tab',
   navigationMode: 'tab',

+ 1 - 1
packages/app/src/components/TrashPageList.jsx

@@ -69,7 +69,7 @@ const TrashPageList = (props) => {
 
 
   return (
   return (
     <div data-testid="trash-page-list" className="mt-5 d-edit-none">
     <div data-testid="trash-page-list" className="mt-5 d-edit-none">
-      <CustomNavAndContents navTabMapping={navTabMapping} emptyTrashButton={EmptyTrashButton()} />
+      <CustomNavAndContents navTabMapping={navTabMapping} navRightElement={EmptyTrashButton()} />
     </div>
     </div>
   );
   );
 };
 };