@gen3/frontend 0.10.82 → 0.10.83

package/dist/dts/utils/mergeDefaultTailwindClassnames.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeDefaultTailwindClassnames.js","sourceRoot":"","sources":["../../../src/utils/mergeDefaultTailwindClassnames.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAKzC;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,8BAA8B,GAAG,UAC5C,aAAyB,EACzB,EAAkE;IAAhE,IAAA,YAAc,EAAd,IAAI,mBAAG,OAAO,KAAA,EAAK,UAAU,cAA/B,QAAiC,CAAF;IAE/B,IAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC/C,IAAM,YAAY,gBAAQ,aAAa,CAAE,CAAC;IAE1C,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,WAAW,CAAC,OAAO,CAAC,UAAC,GAAG;YACtB,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpB,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YACnE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,WAAW,CAAC,OAAO,CAAC,UAAC,GAAG;YACtB,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpB,YAAY,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;YACtC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,iCAAiC,GAAG,UAC/C,UAA8B,EAC9B,aAAqB,IACV,OAAA,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,EAAjE,CAAiE,CAAC"}
+{"version":3,"file":"mergeDefaultTailwindClassnames.js","sourceRoot":"","sources":["../../../src/utils/mergeDefaultTailwindClassnames.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAOzC;;;;;;;GAOG;AACH,MAAM,CAAC,IAAM,8BAA8B,GAAG,UAC5C,aAA8B,EAC9B,EAAkE;IAAhE,IAAA,YAAc,EAAd,IAAI,mBAAG,OAAO,KAAA,EAAK,UAAU,cAA/B,QAAiC,CAAF;IAE/B,IAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC/C,IAAM,YAAY,gBAAQ,aAAa,CAAE,CAAC;IAE1C,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,WAAW,CAAC,OAAO,CAAC,UAAC,GAAG;YACtB,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpB,YAAY,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YACnE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,WAAW,CAAC,OAAO,CAAC,UAAC,GAAG;YACtB,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpB,YAAY,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;YACtC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,iCAAiC,GAAG,UAC/C,UAA8B,EAC9B,aAAqB,IACV,OAAA,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,EAAjE,CAAiE,CAAC"}

package/dist/esm/index.js

@@ -965,10 +965,10 @@ var LoginButtonVisibility = /*#__PURE__*/ function(LoginButtonVisibility) {
 /**
  * Merges default and user values for Tailwind classnames.
  *
- * @param {RecordType} defaultValues - The default values for the classnames.
- * @param {RecordType} userValues - The user-defined values for the classnames.
+ * @param {StylingOverride} defaultValues - The default values for the classnames.
+ * @param {StylingOverride} userValues - The user-defined values for the classnames.
  * @param {StylingMergeMode} mode - Whether to merge or replace the default and user values. Default is merge.
- * @returns {RecordType} - The merged default and user values for the classnames.
+ * @returns {StylingOverride} - The merged default and user values for the classnames.
  */ const mergeDefaultTailwindClassnames = (defaultValues, { mode = 'merge', ...userValues })=>{
     const defaultKeys = Object.keys(defaultValues);
     const mergedValues = {
@@ -3058,7 +3058,16 @@ const LoginAccountButton = ({ className = undefined })=>{
     return null;
 };
 
-const TopIconButton = ({ name, leftIcon = undefined, rightIcon = undefined, classNames = {}, drawBorder = true })=>{
+const IconSize = {
+    xs: 14,
+    sm: 16,
+    md: 20,
+    lg: 24,
+    xl: 32,
+    'xl-2': 36
+};
+
+const TopIconButton = ({ name, leftIcon = undefined, rightIcon = undefined, iconSize = 'md', classNames = {}, drawBorder = true })=>{
     const classNamesDefaults = {
         root: `flex items-center align-middle px-2 my-2`,
         button: 'flex flex-nowrap items-center align-middle border-b-2 hover:border-accent border-transparent',
@@ -3067,6 +3076,8 @@ const TopIconButton = ({ name, leftIcon = undefined, rightIcon = undefined, clas
         rightIcon: 'text-secondary-contrast-lighter pl-1'
     };
     const mergedClassnames = mergeDefaultTailwindClassnames(classNamesDefaults, classNames);
+    // get the icon size otherwise use the value of iconsSize as a string value: e.g. 2em
+    const iconSz = IconSize[iconSize] ?? iconSize;
     return /*#__PURE__*/ jsx("div", {
         className: extractClassName('root', mergedClassnames),
         "aria-label": name,
@@ -3076,6 +3087,8 @@ const TopIconButton = ({ name, leftIcon = undefined, rightIcon = undefined, clas
             children: [
                 leftIcon ? /*#__PURE__*/ jsx(Icon, {
                     icon: leftIcon,
+                    width: iconSz,
+                    height: iconSz,
                     className: extractClassName('leftIcon', mergedClassnames)
                 }) : null,
                 /*#__PURE__*/ jsxs("p", {
@@ -3086,7 +3099,9 @@ const TopIconButton = ({ name, leftIcon = undefined, rightIcon = undefined, clas
                         " "
                     ]
                 }),
-                rightIcon ? /*#__PURE__*/ jsx(Icon, {
+                rightIcon && rightIcon.length > 0 ? /*#__PURE__*/ jsx(Icon, {
+                    width: iconSz,
+                    height: iconSz,
                     icon: rightIcon,
                     className: extractClassName('rightIcon', mergedClassnames)
                 }) : null
@@ -3094,9 +3109,10 @@ const TopIconButton = ({ name, leftIcon = undefined, rightIcon = undefined, clas
         })
     });
 };
-const processTopBarItems = (items, showLogin)=>{
+const processTopBarItems = (items, showLogin, classNames, dividerClassname)=>{
     return items.reduce((acc, item, index)=>{
         const needsBorder = !(index === items.length - 1 && !showLogin);
+        const mergedClassnames = item?.classNames ? mergeDefaultTailwindClassnames(classNames, item.classNames) : classNames;
         acc.push(/*#__PURE__*/ jsxs("a", {
             className: "flex",
             href: item.href,
@@ -3104,18 +3120,18 @@ const processTopBarItems = (items, showLogin)=>{
                 ' ',
                 /*#__PURE__*/ jsx(TopIconButton, {
                     name: item.name,
+                    iconSize: item.iconSize,
                     leftIcon: item.leftIcon,
                     rightIcon: item.rightIcon,
-                    classNames: item.classNames,
+                    classNames: mergedClassnames,
                     drawBorder: needsBorder
                 }),
                 ' ',
                 /*#__PURE__*/ jsx(Divider, {
                     size: "md",
-                    color: "accent.4",
                     orientation: "vertical",
                     classNames: {
-                        root: 'my-2'
+                        root: dividerClassname
                     }
                 })
             ]
@@ -3123,12 +3139,21 @@ const processTopBarItems = (items, showLogin)=>{
         return acc;
     }, []);
 };
-const TopBar = ({ items, loginButtonVisibility = LoginButtonVisibility.Hidden, externalLoginUrl, classNames = {} })=>{
+const TopBar = ({ items, loginButtonVisibility = LoginButtonVisibility.Hidden, externalLoginUrl, classNames = {}, itemClassnames = {} })=>{
     const classNamesDefaults = {
         root: 'flex justify-end items-center align-middle w-100 bg-secondary-lighter',
-        login: 'font-content hover:border-accent'
+        login: 'font-content hover:border-accent',
+        divider: 'border-accent my-2'
+    };
+    const itemClassnameDefaults = {
+        root: `flex items-center align-middle px-2 my-2`,
+        button: 'flex flex-nowrap items-center align-middle border-b-2 hover:border-accent border-transparent',
+        leftIcon: 'text-secondary-contrast-lighter pr-1',
+        label: 'font-content text-secondary-contrast-lighter block',
+        rightIcon: 'text-secondary-contrast-lighter pl-1'
     };
     const mergedClassnames = mergeDefaultTailwindClassnames(classNamesDefaults, classNames);
+    const mergedItemClassnames = mergeDefaultTailwindClassnames(itemClassnameDefaults, itemClassnames);
     return /*#__PURE__*/ jsx("div", {
         children: /*#__PURE__*/ jsx("header", {
             className: extractClassName('root', mergedClassnames),
@@ -3137,7 +3162,7 @@ const TopBar = ({ items, loginButtonVisibility = LoginButtonVisibility.Hidden, e
                 "aria-label": "top most navigation",
                 className: "flex items-center align-middle",
                 children: [
-                    processTopBarItems(items, loginButtonVisibility === LoginButtonVisibility.Visible),
+                    processTopBarItems(items, loginButtonVisibility === LoginButtonVisibility.Visible, mergedItemClassnames, extractClassName('divider', mergedClassnames)),
                     loginButtonVisibility != LoginButtonVisibility.Hidden ? /*#__PURE__*/ jsxs("div", {
                         className: "flex items-center",
                         children: [
@@ -3146,7 +3171,9 @@ const TopBar = ({ items, loginButtonVisibility = LoginButtonVisibility.Hidden, e
                             }),
                             /*#__PURE__*/ jsx(Divider, {
                                 size: "md",
-                                color: "accent.4",
+                                classNames: {
+                                    root: extractClassName('divider', mergedClassnames)
+                                },
                                 orientation: "vertical"
                             })
                         ]
@@ -3557,6 +3584,9 @@ const HorizontalNavigationBar = ({ actions, items, logo = undefined, loginIcon =
                 externalLoginUrl: top?.externalLoginUrl,
                 classNames: {
                     ...top.classNames
+                },
+                itemClassnames: {
+                    ...top.itemClassnames
                 }
             }),
             banners?.map((banner)=>/*#__PURE__*/ createElement(Banner, {
@@ -14884,10 +14914,6 @@ const createMantineTheme = (fonts, colors)=>{
                 Object.values(values)
             ] : [])),
         primaryColor: 'primary',
-        primaryShade: {
-            light: 4,
-            dark: 7
-        },
         breakpoints: {
             xs: '31.25em',
             sm: '50em',
@@ -18549,15 +18575,6 @@ const getNumberOfSelectedItemsInList = (selections, listId)=>{
 };
 const isListInSelection = (listId, selections)=>listId in selections;
 
-const IconSize = {
-    xs: 14,
-    sm: 16,
-    md: 20,
-    lg: 24,
-    xl: 32,
-    'xl-2': 36
-};
-
 const SearchAndActions = ({ createList, gatherData, size = 'sm' })=>{
     const { selections, clearSelections } = useDataLibrarySelection();
     const retrieveDisabled = Object.keys(selections).length === 0;
@@ -20775,5 +20792,5 @@ async function credentialsLogout(req, res) {
     res.redirect(307, '/');
 }
 
-export { AISearchPageGetServerSideProps, ActionButton, AdminAuthZPageGetServerSideProps, AiSearch, AISearchPage as AiSearchPage, AnalysisCenter, AnalysisEditorPage, AnalysisEditorPageGetServerSideProps, AnalysisPage, AnalysisPageGetServerSideProps, AuthzPage, BaseModal, Charts, CohortBuilder, CollapsableSidebar, ColorThemePage, ColorThemePageGetServerSideProps, ContentSource, CreateCredentialsAPIKeyModal, CrosswalkPage, CrosswalkPageGetServerSideProps, Custom404Page, DataLibraryPage, DataLibraryPageGetServerSideProps, DictionaryPage, DictionaryPageGetServerSideProps, DiscoveryCellRendererFactory, DiscoveryProvider as DiscoveryConfigProvider, DiscoveryIndexPanel, DiscoveryPage, DiscoveryPageGetServerSideProps, DiscoveryRowRendererFactory, DropdownButton, EnumFacetChart, ErrorCard, ExplorerPage, ExplorerPageGetServerSideProps, ExplorerPageGetServerSidePropsForConfigId, ExplorerTableCellRendererFactory, ExplorerTableDetailsPanelFactory, FirstTimeModal, Footer, Gen3Button, Gen3ButtonReverse, Gen3Link, Gen3ModalsProvider, Gen3Provider, GqlQueryEditor$1 as GqlQueryEditor, Header, HoverLink, LandingPage, LandingPageGetStaticProps, LoginButton, LoginPage, LoginPageGetServerSideProps, LoginPanel, LoginProvidersPanel, MinutesToMilliseconds, NavPageLayout, NavigationBar, NavigationButton, NoAccessModal, NotebookLitePage, NotebookLitePageGetStaticProps, ProfilePage, ProfilePageGetServerSideProps, ProfileProvider, ProtectedContent, QueryPage, QueryPageGetServerSideProps, ReactECharts, ResourcesFilters, SPECIAL_CASE_FIELDS, SessionExpiredModal, StudyGroup, SubmissionPage, SubmissionPageGetServerSideProps, TagCloud, TailwindConfig, UploadJSONButton, User, Workspace, WorkspaceNoAccessPage, WorkspaceNoAccessPageServerSideProps, WorkspacePage, WorkspacePageGetServerSideProps, capitalize, computeRowSpan, convertMinutesToMilliseconds, convertSecondsToMilliseconds, create10ColorAccessibleContrast, create10ColorPallet, createMantineTheme, credentialsLogin, credentialsLogout, extractObjectKey, focusStyles, getCurrentUnixTimestamp, getNavPageLayoutPropsFromConfig, getParamsValueAsString, getTagInfo, hasOwnProperty, isArrayOfString, isPropertyKey, isTextTransform$1 as isTextTransform, processLabel$1 as processLabel, processRangeKeyLabel, registerCohortBuilderDefaultPreviewRenderers, registerCohortDiscoveryApp, registerCohortSimilarityApp, registerDefaultDiscoveryDataLoaders, registerDiscoveryDefaultCellRenderers, registerDiscoveryDefaultStudyPreviewRenderers, registerExplorerDefaultCellRenderers, registerMetadataSchemaApp, removeKey$1 as removeKey, resourcePathFromProjectID, sessionLogout, sessionToken, stripTrailingSlash, toDisplayName, truncateString, unixTimeToString, useDiscoveryContext, userHasMethodForServiceOnResource$1 as userHasMethodForServiceOnResource };
+export { AISearchPageGetServerSideProps, ActionButton, AdminAuthZPageGetServerSideProps, AiSearch, AISearchPage as AiSearchPage, AnalysisCenter, AnalysisEditorPage, AnalysisEditorPageGetServerSideProps, AnalysisPage, AnalysisPageGetServerSideProps, AuthzPage, BaseModal, Charts, CohortBuilder, CollapsableSidebar, ColorThemePage, ColorThemePageGetServerSideProps, ContentSource, CreateCredentialsAPIKeyModal, CrosswalkPage, CrosswalkPageGetServerSideProps, Custom404Page, DataLibraryPage, DataLibraryPageGetServerSideProps, DictionaryPage, DictionaryPageGetServerSideProps, DiscoveryCellRendererFactory, DiscoveryProvider as DiscoveryConfigProvider, DiscoveryIndexPanel, DiscoveryPage, DiscoveryPageGetServerSideProps, DiscoveryRowRendererFactory, DropdownButton, EnumFacetChart, ErrorCard, ExplorerPage, ExplorerPageGetServerSideProps, ExplorerPageGetServerSidePropsForConfigId, ExplorerTableCellRendererFactory, ExplorerTableDetailsPanelFactory, FirstTimeModal, Footer, Gen3Button, Gen3ButtonReverse, Gen3Link, Gen3ModalsProvider, Gen3Provider, GqlQueryEditor$1 as GqlQueryEditor, Header, HoverLink, LandingPage, LandingPageGetStaticProps, LoginButton, LoginPage, LoginPageGetServerSideProps, LoginPanel, LoginProvidersPanel, MinutesToMilliseconds, NavPageLayout, NavigationBar, NavigationButton, NoAccessModal, NotebookLitePage, NotebookLitePageGetStaticProps, ProfilePage, ProfilePageGetServerSideProps, ProfileProvider, ProtectedContent, QueryPage, QueryPageGetServerSideProps, ReactECharts, ResourcesFilters, SPECIAL_CASE_FIELDS, SessionExpiredModal, StudyGroup, SubmissionPage, SubmissionPageGetServerSideProps, TagCloud, TailwindConfig, TopBar, UploadJSONButton, User, Workspace, WorkspaceNoAccessPage, WorkspaceNoAccessPageServerSideProps, WorkspacePage, WorkspacePageGetServerSideProps, capitalize, computeRowSpan, convertMinutesToMilliseconds, convertSecondsToMilliseconds, create10ColorAccessibleContrast, create10ColorPallet, createMantineTheme, credentialsLogin, credentialsLogout, extractObjectKey, focusStyles, getCurrentUnixTimestamp, getNavPageLayoutPropsFromConfig, getParamsValueAsString, getTagInfo, hasOwnProperty, isArrayOfString, isPropertyKey, isTextTransform$1 as isTextTransform, processLabel$1 as processLabel, processRangeKeyLabel, registerCohortBuilderDefaultPreviewRenderers, registerCohortDiscoveryApp, registerCohortSimilarityApp, registerDefaultDiscoveryDataLoaders, registerDiscoveryDefaultCellRenderers, registerDiscoveryDefaultStudyPreviewRenderers, registerExplorerDefaultCellRenderers, registerMetadataSchemaApp, removeKey$1 as removeKey, resourcePathFromProjectID, sessionLogout, sessionToken, stripTrailingSlash, toDisplayName, truncateString, unixTimeToString, useDiscoveryContext, userHasMethodForServiceOnResource$1 as userHasMethodForServiceOnResource };
 //# sourceMappingURL=index.js.map