Browse Source

omit modifier

ryoji-s 2 years ago
parent
commit
065784f696

+ 0 - 1
apps/app/src/components/Bookmarks/BookmarkFolderItemControl.tsx

@@ -27,7 +27,6 @@ export const BookmarkFolderItemControl: React.FC<{
         </DropdownToggle>
         </DropdownToggle>
       ) }
       ) }
       <DropdownMenu
       <DropdownMenu
-        modifiers={{ preventOverflow: { boundariesElement: 'viewport' } }}
         container="body"
         container="body"
         style={{ zIndex: 1055 }} /* make it larger than $zindex-modal of bootstrap */
         style={{ zIndex: 1055 }} /* make it larger than $zindex-modal of bootstrap */
       >
       >

+ 0 - 2
apps/app/src/components/Bookmarks/BookmarkFolderMenu.tsx

@@ -195,8 +195,6 @@ export const BookmarkFolderMenu = (props: BookmarkFolderMenuProps): JSX.Element
         persist
         persist
         positionFixed
         positionFixed
         className='grw-bookmark-folder-menu'
         className='grw-bookmark-folder-menu'
-        // TODO: activate (https://redmine.weseek.co.jp/issues/128468)
-        // modifiers={getCustomModifiers(true)}
       >
       >
         { renderBookmarkMenuItem() }
         { renderBookmarkMenuItem() }
       </DropdownMenu>
       </DropdownMenu>

+ 0 - 1
apps/app/src/components/Bookmarks/BookmarkItem.tsx

@@ -186,7 +186,6 @@ export const BookmarkItem = (props: Props): JSX.Element => {
         </div>
         </div>
 
 
         <UncontrolledTooltip
         <UncontrolledTooltip
-          modifiers={{ preventOverflow: { boundariesElement: 'window' } }}
           autohide={false}
           autohide={false}
           placement="right"
           placement="right"
           target={bookmarkItemId}
           target={bookmarkItemId}

+ 0 - 1
apps/app/src/components/Page/CopyDropdown.jsx

@@ -120,7 +120,6 @@ const CopyDropdown = (props) => {
 
 
         <DropdownMenu
         <DropdownMenu
           positionFixed
           positionFixed
-          modifiers={{ preventOverflow: { boundariesElement: 'viewport' } }}
           style={{ zIndex: 1016 }} /* zIndex: 1016 // larger than z-index value of grw-subnav-fixed-container in GrowiSubNavigationSwitcher.module.scss */
           style={{ zIndex: 1016 }} /* zIndex: 1016 // larger than z-index value of grw-subnav-fixed-container in GrowiSubNavigationSwitcher.module.scss */
         >
         >
           <div className="d-flex align-items-center justify-content-between">
           <div className="d-flex align-items-center justify-content-between">

+ 1 - 1
apps/app/src/components/RevisionComparer/RevisionComparer.tsx

@@ -77,7 +77,7 @@ export const RevisionComparer = (props: RevisionComparerProps): JSX.Element => {
           >
           >
             <i className="ti ti-clipboard"></i>
             <i className="ti ti-clipboard"></i>
           </DropdownToggle>
           </DropdownToggle>
-          <DropdownMenu positionFixed right modifiers={{ preventOverflow: { boundariesElement: undefined } }}>
+          <DropdownMenu positionFixed right >
             {/* Page path URL */}
             {/* Page path URL */}
             <CopyToClipboard text={generateURL(currentPagePath)}>
             <CopyToClipboard text={generateURL(currentPagePath)}>
               <DropdownItem className="px-3">
               <DropdownItem className="px-3">

+ 0 - 3
packages/ui/package.json

@@ -23,9 +23,6 @@
   "dependencies": {
   "dependencies": {
     "@growi/core": "link:../core"
     "@growi/core": "link:../core"
   },
   },
-  "devDependencies": {
-    "reactstrap": "8.10.1"
-  },
   "peerDependencies": {
   "peerDependencies": {
     "next": "^13",
     "next": "^13",
     "react": "^18.2.0",
     "react": "^18.2.0",

+ 0 - 13
packages/ui/src/interfaces/popper-data.ts

@@ -13,16 +13,3 @@ export interface PopperData {
     arrow: { top: number; left: number };
     arrow: { top: number; left: number };
   };
   };
 }
 }
-
-export interface CustomModifiers {
-  applyStyle?: {
-    enabled: boolean
-  }
-  computeStyle?: {
-    enabled: boolean,
-    fn: (data: PopperData) => PopperData
-  }
-  preventOverflow: {
-    boundariesElement: string
-  }
-}

+ 0 - 1
packages/ui/src/utils/index.ts

@@ -1,3 +1,2 @@
 export * from './browser-utils';
 export * from './browser-utils';
 export * from './use-fullscreen';
 export * from './use-fullscreen';
-export * from './reactstrap-modifiers';

+ 0 - 34
packages/ui/src/utils/reactstrap-modifiers.ts

@@ -1,34 +0,0 @@
-import { PopperData, CustomModifiers } from '~/interfaces/popper-data';
-
-// Conditional modifiers
-// To prevent flickering. only happened when `right` is true and persist props should be enabled
-const modifiersForRightAlign: CustomModifiers = {
-  applyStyle: {
-    enabled: true,
-  },
-  computeStyle: {
-    enabled: true,
-    fn: (data: PopperData): PopperData => {
-      const popperRect = data.offsets.popper;
-      // Calculate transform styles
-      const newTransform = `translate3d(${popperRect.left - window.innerWidth + popperRect.width}px, ${popperRect.top}px, 0px)`;
-      const styles = {
-        top: '0px',
-        right: '0px',
-        willChange: 'transform',
-        transform: newTransform,
-      };
-      data.styles = { ...data.styles, ...styles };
-      return data;
-    },
-  },
-  preventOverflow: { boundariesElement: 'viewport' },
-};
-
-export const getCustomModifiers = (alignRight?: boolean): CustomModifiers => {
-  return (
-    alignRight
-      ? modifiersForRightAlign
-      : { preventOverflow: { boundariesElement: 'viewport' } }
-  );
-};

+ 1 - 29
yarn.lock

@@ -7752,13 +7752,6 @@ dom-accessibility-api@^0.5.9:
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz#caa6d08f60388d0bb4539dd75fe458a9a1d0014c"
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz#caa6d08f60388d0bb4539dd75fe458a9a1d0014c"
   integrity sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g==
   integrity sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g==
 
 
-dom-helpers@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
-  integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-
 dom-helpers@^5.0.1, dom-helpers@^5.2.0:
 dom-helpers@^5.0.1, dom-helpers@^5.2.0:
   version "5.2.1"
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
@@ -14429,7 +14422,7 @@ react-overlays@^5.1.0:
     uncontrollable "^7.2.1"
     uncontrollable "^7.2.1"
     warning "^4.0.3"
     warning "^4.0.3"
 
 
-react-popper@^1.0.0, react-popper@^1.3.6:
+react-popper@^1.0.0:
   version "1.3.11"
   version "1.3.11"
   resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.11.tgz#a2cc3f0a67b75b66cfa62d2c409f9dd1fcc71ffd"
   resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.11.tgz#a2cc3f0a67b75b66cfa62d2c409f9dd1fcc71ffd"
   integrity sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==
   integrity sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==
@@ -14481,16 +14474,6 @@ react-toastify@^9.1.1:
   dependencies:
   dependencies:
     clsx "^1.1.1"
     clsx "^1.1.1"
 
 
-react-transition-group@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-3.0.0.tgz#36efa4db970d5eec5e3028e0c458931163fa3b9b"
-  integrity sha512-A9ojB/LWECbFj58SNfjK1X9aaAU+1olLS0DFSikvrr2KfMaiBELemHDa5dKNvcTk2t3gUtDL/PJpFrBKDfMpLg==
-  dependencies:
-    dom-helpers "^3.4.0"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-    react-lifecycles-compat "^3.0.4"
-
 react-transition-group@^4.4.2:
 react-transition-group@^4.4.2:
   version "4.4.5"
   version "4.4.5"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
@@ -14513,17 +14496,6 @@ react@^18.2.0:
   dependencies:
   dependencies:
     loose-envify "^1.1.0"
     loose-envify "^1.1.0"
 
 
-reactstrap@8.10.1:
-  version "8.10.1"
-  resolved "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.10.1.tgz#43ea596c7f82f88997a9c8aae203417910262d3f"
-  integrity sha512-StjLADa/12yMNjafrSs+UD7sZAGtKpLO9fZp++2Dj0IzJinqY7eQhXlM3nFf0q40YsIcLvQdFc9pKF8PF4f0Qg==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    classnames "^2.2.3"
-    prop-types "^15.5.8"
-    react-popper "^1.3.6"
-    react-transition-group "^3.0.0"
-
 reactstrap@^9.2.0:
 reactstrap@^9.2.0:
   version "9.2.0"
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/reactstrap/-/reactstrap-9.2.0.tgz#3bde2b2e39e91962676167ac60edea89f8584382"
   resolved "https://registry.yarnpkg.com/reactstrap/-/reactstrap-9.2.0.tgz#3bde2b2e39e91962676167ac60edea89f8584382"