Merge pull request #476 from sirraminyavari/dev

major actionbar bug fixes
sirraminyavari · Jun 13, 2023 · f1ae281 · f1ae281
2 parents 4c973b2 + 706bb9d
commit f1ae281
Show file tree

Hide file tree

Showing 51 changed files with 1,868 additions and 538 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "@atlaskit/tree": "^8.6.0",
     "@cliqmind/react-table": "^7.8.0-dev.1",
-    "@cliqmind/rv-components": "0.11.8-dev",
+    "@cliqmind/rv-components": "^0.4.1-dev-1",
     "@draft-js-plugins/editor": "^4.1.0",
     "@draft-js-plugins/mention": "^4.5.1",
     "@lottiefiles/react-lottie-player": "^3.4.1",

diff --git a/public/index.html b/public/index.html
@@ -135,7 +135,7 @@
     ></script>
 
     <link rel="shortcut icon" href="/api/rv/fav_icon" />
-    <link rel="stylesheet" type="text/css" href="/api/rv/theme" />
+    <!-- <link rel="stylesheet" type="text/css" href="/api/rv/theme" /> -->
     <link rel="stylesheet" type="text/css" href="/api/rv/css_direction" />
     <script
       type="text/javascript"
@@ -274,7 +274,7 @@
     </script>
     <title>Raaivan</title>
   </head>
-  <body class="Direction TextAlign default" style="font-size: unset !important">
+  <body class="Direction TextAlign" style="font-size: unset !important">
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <div id="block-editor-portal"></div>

diff --git a/src/App.js b/src/App.js
@@ -17,6 +17,7 @@ import { CV_WHITE } from 'constant/CssVariables';
 import { avatarIconURL } from 'helpers/helpers';
 import consoleLogger from 'utils/console/consoleLogger';
 import 'scss/global.scss';
+import ThemeProvider from 'components/ThemeProvider/ThemeProvider';
 
 const { RV_RTL, GlobalUtilities } = window;
 
@@ -44,24 +45,26 @@ const App = () => {
         bodyClassName="rv-font-default"
       />
       <StoreProvider>
-        <Suspense fallback={<LogoLoader />}>
-          <Router>
-            <ScrollToTop />
-            <Switch>
-              <Route
-                path={AUTH_PATH}
-                render={(props) => (
-                  <CheckRoute
-                    props={props}
-                    name={LOGIN_NAME}
-                    component={AuthView}
-                  />
-                )}
-              />
-              <PrivateRoute path={ROOT_PATH} component={MainLayout} />
-            </Switch>
-          </Router>
-        </Suspense>
+        <ThemeProvider>
+          <Suspense fallback={<LogoLoader />}>
+            <Router>
+              <ScrollToTop />
+              <Switch>
+                <Route
+                  path={AUTH_PATH}
+                  render={(props) => (
+                    <CheckRoute
+                      props={props}
+                      name={LOGIN_NAME}
+                      component={AuthView}
+                    />
+                  )}
+                />
+                <PrivateRoute path={ROOT_PATH} component={MainLayout} />
+              </Switch>
+            </Router>
+          </Suspense>
+        </ThemeProvider>
       </StoreProvider>
     </ErrorBoundry>
   );

diff --git a/src/components/AdvancedSearch/AdvancedSearch.style.js b/src/components/AdvancedSearch/AdvancedSearch.style.js
@@ -157,12 +157,12 @@ export const CustomInput = styled(Input)`
   }
 `;
 export const AdvancedFilterDialog = styled.div`
-  position: absolute;
-  background-color: ${CV_WHITE};
-  top: ${({ top }) => top + 53 + 'px'};
-  left: ${({ left }) => left + 'px'};
+  position: sticky;
+  // background-color: ${CV_WHITE};
+  top: 0;
+  // left: ${({ left }) => left + 'px'};
   width: 30rem;
   min-height: 10rem;
   z-index: ${GlobalUtilities.zindex.alert()};
-  box-shadow: 1px 3px 20px ${CV_DISTANT};
+  // box-shadow: 1px 3px 20px ${CV_DISTANT};
 `;
diff --git a/src/components/AdvancedSearch/AdvancedSearchDesktop.js b/src/components/AdvancedSearch/AdvancedSearchDesktop.js
@@ -224,42 +224,72 @@ const AdvanceSearchDesktop = ({
                 />
               </TopFilter>
               <div
-                data-tut={'advanced_search_results'}
                 style={{
-                  padding: '0 2rem 2rem 2rem',
+                  display: 'flex',
+                  gap: '0.5rem',
+                  position: 'relative',
+                  paddingInlineEnd: '.5rem',
                 }}
-                {...props}
               >
-                {(isProfile || relatedNodeID) && (
-                  <RelatedTopicsTab
-                    provideNodes={onApplyNodeType && onApplyNodeType}
-                    relatedNodes={relatedNodes}
-                    defaultChecked={isProfile}
-                    showAll
+                <div
+                  data-tut={'advanced_search_results'}
+                  style={{
+                    padding: '0 2rem 2rem 2rem',
+                    width: '100%',
+                  }}
+                  {...props}
+                >
+                  {(isProfile || relatedNodeID) && (
+                    <RelatedTopicsTab
+                      provideNodes={onApplyNodeType && onApplyNodeType}
+                      relatedNodes={relatedNodes}
+                      defaultChecked={isProfile}
+                      showAll
+                    />
+                  )}
+
+                  <UrgentCreate
+                    onDismiss={onCreateUrgent}
+                    hierarchy={hierarchy}
+                    isVisible={urgentCreate}
+                    nodeTypeId={nodeTypeId}
+                    onForceFetch={forceFetch}
+                    dataFetched={totalFound}
+                    nodeType={nodeType}
+                    itemSelectionMode={itemSelectionMode}
                   />
+                  {children &&
+                    React.cloneElement(children, {
+                      searchText: searchText,
+                      dateFilter: dateFilter,
+                      formFilters: formFilters,
+                      forceFetch: forceReload,
+                      isByMe: isProfile ? true : isByMe,
+                      byPeople: byPeople,
+                      isBookMarked: isBookMarked,
+                      onTotalFound: setTotalFound,
+                    })}
+                </div>
+                {isAdvancedSearch && formElements && itemSelectionMode && (
+                  <AdvancedFilterDialog
+                    className={'rv-border-radius-half'}
+                    top={
+                      advancedSearchButtonRef?.current?.getBoundingClientRect()
+                        ?.top
+                    }
+                    left={
+                      advancedSearchButtonRef?.current?.getBoundingClientRect()
+                        ?.left
+                    }
+                  >
+                    <FormFilter
+                      formName={RVDic.AdvancedFilters}
+                      filters={formElements}
+                      onFilter={normalizeSearchElements}
+                      onCloseFilter={() => setIsAdvancedSearch(false)}
+                    />
+                  </AdvancedFilterDialog>
                 )}
-
-                <UrgentCreate
-                  onDismiss={onCreateUrgent}
-                  hierarchy={hierarchy}
-                  isVisible={urgentCreate}
-                  nodeTypeId={nodeTypeId}
-                  onForceFetch={forceFetch}
-                  dataFetched={totalFound}
-                  nodeType={nodeType}
-                  itemSelectionMode={itemSelectionMode}
-                />
-                {children &&
-                  React.cloneElement(children, {
-                    searchText: searchText,
-                    dateFilter: dateFilter,
-                    formFilters: formFilters,
-                    forceFetch: forceReload,
-                    isByMe: isProfile ? true : isByMe,
-                    byPeople: byPeople,
-                    isBookMarked: isBookMarked,
-                    onTotalFound: setTotalFound,
-                  })}
               </div>
             </Maintainer>
           </Scrollable>
@@ -293,21 +323,6 @@ const AdvanceSearchDesktop = ({
           </SideFilter>
         )}
       </div>
-
-      {isAdvancedSearch && formElements && itemSelectionMode && (
-        <AdvancedFilterDialog
-          className={'rv-border-radius-half'}
-          top={advancedSearchButtonRef?.current?.getBoundingClientRect()?.top}
-          left={advancedSearchButtonRef?.current?.getBoundingClientRect()?.left}
-        >
-          <FormFilter
-            formName={RVDic.AdvancedFilters}
-            filters={formElements}
-            onFilter={normalizeSearchElements}
-            onCloseFilter={() => setIsAdvancedSearch(false)}
-          />
-        </AdvancedFilterDialog>
-      )}
     </Container>
   );
 };

diff --git a/src/components/AdvancedSearch/items/FilterBar/FilterBar.js b/src/components/AdvancedSearch/items/FilterBar/FilterBar.js
@@ -533,7 +533,11 @@ const FilterBar = ({
               )}
             >
               <ShadowButton
-                onClick={() => push(`?bookmarked=${isBookMarked ? 0 : 1}`)}
+                onClick={() =>
+                  push(
+                    `${location.pathname}${isBookMarked ? '' : '?bookmarked=1'}`
+                  )
+                }
                 active={isBookMarked}
                 size={RVSizeProp.medium}
                 rounded="half"

diff --git a/src/components/Buttons/Button.tsx b/src/components/Buttons/Button.tsx
@@ -68,7 +68,7 @@ const Button = forwardRef<HTMLButtonElement, IButton>(
             : undefined
         }
         className={classNames(classes || className)}
-        style={{ boxSizing: 'content-box', ...style }}
+        style={{ ...style }}
         disabled={disable}
         onClick={disable || loading ? undefined : onClick}
         {...(!isCustomButton && resolveClass({ type }))}

diff --git a/src/components/Buttons/Toggle/Toggle.js b/src/components/Buttons/Toggle/Toggle.js
diff --git a/src/components/Buttons/Toggle/Toggle.styles.js b/src/components/Buttons/Toggle/Toggle.styles.js