@conduction/components 2.2.4 → 2.2.5

package/src/components/tabs/Tabs.module.css

@@ -1,42 +1,61 @@
 :root {
-  --conduction-tab-list-padding-inline-start: 0px;
-  --conduction-tab-list-border-bottom-width: var(--skeleton-size-3xs);
-  --conduction-tab-list-border-bottom-style: solid;
-  --conduction-tab-list-border-bottom-color: #d1d1d1;
+  --conduction-tabs-tab-background-color: #ffffff;
+  --conduction-tabs-tab-color: #4a4a4a;
+  /* --conduction-tabs-tab-border-width: 0px; */
+  /* --conduction-tabs-tab-border-style: solid; */
+  /* --conduction-tabs-tab-border-color: #ffffff; */
+  /* --conduction-tabs-tab-border-bottom: 0px; */
+  /* --conduction-tabs-tab-border-bottom-width: var(--skeleton-size-3xs); */
+  /* --conduction-tabs-tab-border-bottom-style: solid; */
+  /* --conduction-tabs-tab-border-bottom-color: #d1d1d1; */
+  --conduction-tabs-tab-bottom: -2px;
+  --conduction-tabs-tab-padding-block-start: var(--skeleton-size-xs);
+  --conduction-tabs-tab-padding-block-end: var(--skeleton-size-xs);
+  --conduction-tabs-tab-padding-inline-start: var(--skeleton-size-sm);
+  --conduction-tabs-tab-padding-inline-end: var(--skeleton-size-sm);
+  /* --conduction-tabs-tab-margin-inline-end: var(--skeleton-size-xs); */
+  --conduction-tabs-tab-font-size: var(--skeleton-font-size-sm: );
+  --conduction-tabs-tab-font-weight: var(--skeleton-font-weight-normal);
+  --conduction-tabs-tab-font-family: "Noto Sans", Arial, sans-serif;
+  --conduction-tabs-tab-max-width: unset;
+  /* --conduction-tabs-tab-letter-spacing: 0.02857em; */
+  /* --conduction-tabs-tab-text-transform: uppercase; */
 
-  --conduction-tab-padding-block-start: var(--skeleton-size-xs);
-  --conduction-tab-padding-block-end: var(--skeleton-size-xs);
-  --conduction-tab-padding-inline-start: var(--skeleton-size-sm);
-  --conduction-tab-padding-inline-end: var(--skeleton-size-sm);
-  --conduction-tab-font-size: var(--skeleton-font-size-sm: );
-  --conduction-tab-font-weight: var(--skeleton-font-weight-normal);
-  --conduction-tab-font-family: "Noto Sans", Arial, sans-serif;
-  --conduction-tab-max-width: unset;
-  --conduction-tab-min-width: 160px;
-  --conduction-tab-min-height: 61px;
-  /* --conduction-tab-letter-spacing: 0.02857em; */
-  /* --conduction-tab-text-transform: uppercase; */
-  --conduction-tab-color: #4a4a4a;
+  --conduction-tabs-tab-selected-background-color: #ffffff;
+  --conduction-tabs-tab-selected-color: #4a4a4a;
+  /* --conduction-tabs-tab-selected-box-shadow: 0px 1px 0px 1px #ffffff; */
+  /* --conduction-tabs-tab-selected-border-width: 0px; */
+  /* --conduction-tabs-tab-selected-border-style: solid; */
+  /* --conduction-tabs-tab-selected-border-color: #ffffff; */
+  /* --conduction-tabs-tab-selected-border-bottom: 0; */
+  --conduction-tabs-tab-selected-border-bottom-width: var(--skeleton-size-3xs);
+  --conduction-tabs-tab-selected-border-bottom-style: solid;
+  --conduction-tabs-tab-selected-border-bottom-color: #4376fc;
+  --conduction-tabs-tab-selected-font-weight: var(--skeleton-font-weight-bold);
+  --conduction-tabs-tab-selected-font-family: "Noto Sans", Arial, sans-serif;
+  /* --conduction-tabs-tab-selected-hover-background-color: #ffffff; */
+  /* --conduction-tabs-tab-selected-hover-color: #4a4a4a; */
+  /* --conduction-tabs-tab-selected-hover-text-decoration: underline; */
 
-  --conduction-tab-selected-color: #4a4a4a;
-  --conduction-tab-selected-border-bottom-width: var(--skeleton-size-3xs);
-  --conduction-tab-selected-border-bottom-style: solid;
-  --conduction-tab-selected-border-bottom-color: #4376fc;
-  --conduction-tab-selected-font-weight: var(--skeleton-font-weight-bold);
+  /* --conduction-tabs-tab-hover-background-color: #ffffff; */
+  /* --conduction-tabs-tab-hover-color: #4a4a4a; */
+  /* --conduction-tabs-tab-hover-text-decoration: underline; */
 
-  --conduction-tab-panel-padding-block-start: var(--skeleton-size-lg);
-  --conduction-tab-panel-padding-block-end: var(--skeleton-size-lg);
-  --conduction-tab-panel-padding-inline-start: var(--skeleton-size-lg);
-  --conduction-tab-panel-padding-inline-end: var(--skeleton-size-lg);
+  --conduction-tabs-tab-list-padding-inline-start: 0px;
+  --conduction-tabs-tab-list-margin-block-end: 16px;
+  --conduction-tabs-tab-list-border-bottom-width: var(--skeleton-size-3xs);
+  --conduction-tabs-tab-list-border-bottom-style: solid;
+  --conduction-tabs-tab-list-border-bottom-color: #d1d1d1;
 
-  --conduction-tab-badge-margin-inline-start: var(--skeleton-size-xs);
-}
-
-.tabList {
-  padding-inline-start: var(--conduction-tab-list-padding-inline-start);
-  border-bottom-width: var(--conduction-tab-list-border-bottom-width);
-  border-bottom-style: var(--conduction-tab-list-border-bottom-style);
-  border-bottom-color: var(--conduction-tab-list-border-bottom-color);
+  /* --conduction-tabs-tab-panel-background-color: #ffffff; */
+  --conduction-tabs-tab-panel-padding-block-start: var(--skeleton-size-lg);
+  --conduction-tabs-tab-panel-padding-block-end: var(--skeleton-size-lg);
+  --conduction-tabs-tab-panel-padding-inline-start: var(--skeleton-size-lg);
+  --conduction-tabs-tab-panel-padding-inline-end: var(--skeleton-size-lg);
+  /* --conduction-tabs-tab-panel-border-width: 0px; */
+  /* --conduction-tabs-tab-panel-border-style: solid; */
+  /* --conduction-tabs-tab-panel-border-color: #ffffff; */
+  /* --conduction-tabs-tab-panel-border-top: 0; */
 }
 
 .tab {
@@ -49,54 +68,75 @@
   box-sizing: border-box;
   text-align: center;
   white-space: normal;
-  bottom: -2px;
 
-  color: var(--conduction-tab-color);
-  padding-block-start: var(--conduction-tab-padding-block-start);
-  padding-block-end: var(--conduction-tab-padding-block-end);
-  padding-inline-start: var(--conduction-tab-padding-inline-start);
-  padding-inline-end: var(--conduction-tab-padding-inline-end);
-  font-size: var(--conduction-tab-font-size);
-  font-weight: var(--conduction-tab-font-weight);
-  font-family: var(--conduction-tab-font-family);
-  max-width: var(--conduction-tab-max-width);
-  min-width: var(--conduction-tab-min-width);
-  min-height: var(--conduction-tab-min-height);
-  letter-spacing: var(--conduction-tab-letter-spacing);
-  text-transform: var(--conduction-tab-text-transform);
-
-  border-bottom-width: var(--conduction-tab-list-border-bottom-width);
-  border-bottom-style: var(--conduction-tab-list-border-bottom-style);
-  border-bottom-color: var(--conduction-tab-list-border-bottom-color);
+  background-color: var(--conduction-tabs-tab-background-color);
+  color: var(--conduction-tabs-tab-color);
+  border-width: var(--conduction-tabs-tab-border-width);
+  border-style: var(--conduction-tabs-tab-border-style);
+  border-color: var(--conduction-tabs-tab-border-color);
+  border-bottom: var(--conduction-tabs-tab-border-bottom);
+  border-bottom-width: var(--conduction-tabs-tab-border-bottom-width);
+  border-bottom-style: var(--conduction-tabs-tab-border-bottom-style);
+  border-bottom-color: var(--conduction-tabs-tab-border-bottom-color);
+  bottom: var(--conduction-tabs-tab-bottom);
+  padding-block-start: var(--conduction-tabs-tab-padding-block-start);
+  padding-block-end: var(--conduction-tabs-tab-padding-block-end);
+  padding-inline-start: var(--conduction-tabs-tab-padding-inline-start);
+  padding-inline-end: var(--conduction-tabs-tab-padding-inline-end);
+  margin-inline-end: var(--conduction-tabs-tab-margin-inline-end);
+  font-size: var(--conduction-tabs-tab-font-size);
+  font-weight: var(--conduction-tabs-tab-font-weight);
+  font-family: var(--conduction-tabs-tab-font-family);
+  min-height: var(--conduction-tabs-tab-min-height);
+  letter-spacing: var(--conduction-tabs-tab-letter-spacing);
+  text-transform: var(--conduction-tabs-tab-text-transform);
 }
 
+/* TabSelected */
 .tab[aria-selected="true"] {
-  color: var(--conduction-tab-selected-color);
-  border-bottom-width: var(--conduction-tab-selected-border-bottom-width);
-  border-bottom-style: var(--conduction-tab-selected-border-bottom-style);
-  border-bottom-color: var(--conduction-tab-selected-border-bottom-color);
-  font-weight: var(--conduction-tab-selected-font-weight);
+  background-color: var(--conduction-tabs-tab-selected-background-color);
+  color: var(--conduction-tabs-tab-selected-color);
+  box-shadow: var(--conduction-tabs-tab-selected-box-shadow);
+  border-width: var(--conduction-tabs-tab-selected-border-width);
+  border-style: var(--conduction-tabs-tab-selected-border-style);
+  border-color: var(--conduction-tabs-tab-selected-border-color);
+  border-bottom: var(--conduction-tabs-tab-selected-border-bottom);
+  border-bottom-width: var(--conduction-tabs-tab-selected-border-bottom-width);
+  border-bottom-style: var(--conduction-tabs-tab-selected-border-bottom-style);
+  border-bottom-color: var(--conduction-tabs-tab-selected-border-bottom-color);
+  font-weight: var(--conduction-tabs-tab-selected-font-weight);
+  font-family: var(--conduction-tabs-tab-selected-font-family);
 }
 
-.tabs [class*="react-tabs__tab-panel--selected"] {
-  padding-block-start: var(--conduction-tab-panel-padding-block-start);
-  padding-block-end: var(--conduction-tab-panel-padding-block-end);
-  padding-inline-start: var(--conduction-tab-panel-padding-inline-start);
-  padding-inline-end: var(--conduction-tab-panel-padding-inline-end);
+.tab[aria-selected="true"]:hover {
+  background-color: var(--conduction-tabs-tab-selected-hover-background-color);
+  color: var(--conduction-tabs-tab-selected-hover-color);
+  text-decoration: var(--conduction-tabs-tab-selected-hover-text-decoration);
+}
+.tab:hover {
+  background-color: var(--conduction-tabs-tab-hover-background-color);
+  color: var(--conduction-tabs-tab-hover-color);
+  text-decoration: var(--conduction-tabs-tab-hover-text-decoration);
 }
 
-.badge {
-  margin-inline-start: var(--conduction-tab-badge-margin-inline-start);
-  background-color: var(--utrecht-badge-counter-background-color, var(--utrecht-badge-background-color, #000));
-  border-radius: var(--utrecht-badge-counter-border-radius, var(--utrecht-badge-border-radius, 0.5ch));
-  color: var(--utrecht-badge-counter-color, var(--utrecht-badge-color, #fff));
-  display: inline-block;
-  font-family: var(--utrecht-document-font-family, sans-serif);
-  font-style: var(--utrecht-badge-counter-font-style, normal);
-  font-weight: var(--utrecht-badge-counter-font-weight, var(--utrecht-badge-font-weight, bold));
-  padding-block-end: var(--utrecht-badge-counter-padding-block, var(--utrecht-badge-padding-block, 0.5ex));
-  padding-block-start: var(--utrecht-badge-counter-padding-block, var(--utrecht-badge-padding-block, 0.5ex));
-  padding-inline-end: var(--utrecht-badge-counter-padding-inline, var(--utrecht-badge-padding-inline, 0.5ch));
-  padding-inline-start: var(--utrecht-badge-counter-padding-inline, var(--utrecht-badge-padding-inline, 0.5ch));
-  text-decoration: none;
+.tabList {
+  display: flex;
+  padding-inline-start: var(--conduction-tabs-tab-list-padding-inline-start);
+  margin-block-end: var(--conduction-tabs-tab-list-margin-block-end);
+  border-bottom-width: var(--conduction-tabs-tab-list-border-bottom-width);
+  border-bottom-style: var(--conduction-tabs-tab-list-border-bottom-style);
+  border-bottom-color: var(--conduction-tabs-tab-list-border-bottom-color);
+}
+
+/* TabPanel */
+.tabs [class*="react-tabs__tab-panel--selected"] {
+  background-color: var(--conduction-tabs-tab-panel-background-color);
+  padding-block-start: var(--conduction-tabs-tab-panel-padding-block-start);
+  padding-block-end: var(--conduction-tabs-tab-panel-padding-block-end);
+  padding-inline-start: var(--conduction-tabs-tab-panel-padding-inline-start);
+  padding-inline-end: var(--conduction-tabs-tab-panel-padding-inline-end);
+  border-width: var(--conduction-tabs-tab-panel-border-width);
+  border-style: var(--conduction-tabs-tab-panel-border-style);
+  border-color: var(--conduction-tabs-tab-panel-border-color);
+  border-top: var(--conduction-tabs-tab-panel-border-top);
 }

package/src/components/tabs/Tabs.tsx

@@ -1,37 +1,47 @@
 import * as React from "react";
 import * as styles from "./Tabs.module.css";
-import { Tab, Tabs, TabList, TabPanel } from "react-tabs";
-import { BadgeCounter } from "@utrecht/component-library-react";
-
-interface testProps {
-  tabs: ITabProps[];
-  tabContent: ITabPanelProps[];
-}
-
-interface ITabProps {
-  name: string;
-  badge?: string;
-}
-interface ITabPanelProps {
-  content: JSX.Element;
-}
-
-export const TabContext: React.FC<testProps> = ({ tabs, tabContent }) => {
-  return (
-    <Tabs className={styles.tabs}>
-      <TabList className={styles.tabList}>
-        {tabs.map(({ name, badge }) => (
-          <Tab className={styles.tab}>
-            <span>
-              {name}
-              {badge !== undefined && <BadgeCounter className={styles.badge}>{badge}</BadgeCounter>}
-            </span>
-          </Tab>
-        ))}
-      </TabList>
-      {tabContent.map(({ content }) => (
-        <TabPanel className={styles.tabPanel}>{content}</TabPanel>
-      ))}
-    </Tabs>
-  );
-};
+import {
+  Tabs as RTabs,
+  TabList as RTabList,
+  Tab as RTab,
+  TabPanel as RTabPanel,
+  ReactTabsFunctionComponent,
+  TabProps,
+  TabPanelProps,
+  TabListProps,
+  TabsProps,
+} from "react-tabs";
+
+// Tabs
+export const Tabs: ReactTabsFunctionComponent<TabsProps> = ({ children, ...otherProps }) => (
+  <RTabs className={styles.tabs} {...otherProps}>
+    {children}
+  </RTabs>
+);
+
+Tabs.tabsRole = "Tabs";
+
+// TabList
+export const TabList: ReactTabsFunctionComponent<TabListProps> = ({ children, ...otherProps }) => (
+  <RTabList className={styles.tabList} {...otherProps}>
+    {children}
+  </RTabList>
+);
+
+TabList.tabsRole = "TabList";
+
+// Tab
+export const Tab: ReactTabsFunctionComponent<TabProps> = ({ children, ...otherProps }) => (
+  <RTab className={styles.tab} {...otherProps}>
+    {children}
+  </RTab>
+);
+
+Tab.tabsRole = "Tab";
+
+// TabPanel
+export const TabPanel: ReactTabsFunctionComponent<TabPanelProps> = ({ children, ...otherProps }) => (
+  <RTabPanel {...otherProps}>{children}</RTabPanel>
+);
+
+TabPanel.tabsRole = "TabPanel";

package/src/components/tag/Tag.module.css

@@ -1,44 +1,44 @@
-:root {
-  --conduction-tag-font-size: var(--skeleton-font-size-sm);
-  --conduction-tag-color: var(--skeleton-black);
-  --conduction-tag-background-color: var(--skeleton-color-grey-1);
-  --conduction-tag-border-radius: var(--skeleton-border-radius-md);
-  --conduction-tag-padding: var(--skeleton-size-xs);
-  --conduction-tag-icon-margin-inline-end: var(--skeleton-size-2xs);
-  --conduction-tag-remove-background-color: #ffbdad;
-  --conduction-tag-remove-text-color: #e44f2a;
-}
-
-.tag {
-  display: inline-block;
-  width: fit-content;
-  font-size: var(--conduction-tag-font-size);
-  color: var(--conduction-tag-color);
-  background-color: var(--conduction-tag-background-color);
-  padding-inline-start: var(--conduction-tag-padding);
-  padding-inline-end: var(--conduction-tag-padding);
-  padding-block-start: var(--conduction-tag-padding);
-  padding-block-end: var(--conduction-tag-padding);
-}
-
-.tag > *:not(:last-child) {
-  margin-inline-end: var(--conduction-tag-icon-margin-inline-end);
-}
-
-.clickable :hover {
-  cursor: pointer;
-}
-
-.remove {
-  padding-inline-end: 4px;
-}
-
-.tagContainer {
-  display: flex;
-}
-
-.removeTag:hover {
-  cursor: pointer;
-  background-color: var(--conduction-tag-remove-background-color);
-  color: var(--conduction-tag-remove-text-color);
-}
+:root {
+  --conduction-tag-font-size: var(--skeleton-font-size-sm);
+  --conduction-tag-color: var(--skeleton-black);
+  --conduction-tag-background-color: var(--skeleton-color-grey-1);
+  --conduction-tag-border-radius: var(--skeleton-border-radius-md);
+  --conduction-tag-padding: var(--skeleton-size-xs);
+  --conduction-tag-icon-margin-inline-end: var(--skeleton-size-2xs);
+  --conduction-tag-remove-background-color: #ffbdad;
+  --conduction-tag-remove-text-color: #e44f2a;
+}
+
+.tag {
+  display: inline-block;
+  width: fit-content;
+  font-size: var(--conduction-tag-font-size);
+  color: var(--conduction-tag-color);
+  background-color: var(--conduction-tag-background-color);
+  padding-inline-start: var(--conduction-tag-padding);
+  padding-inline-end: var(--conduction-tag-padding);
+  padding-block-start: var(--conduction-tag-padding);
+  padding-block-end: var(--conduction-tag-padding);
+}
+
+.tag > *:not(:last-child) {
+  margin-inline-end: var(--conduction-tag-icon-margin-inline-end);
+}
+
+.clickable :hover {
+  cursor: pointer;
+}
+
+.remove {
+  padding-inline-end: 4px;
+}
+
+.tagContainer {
+  display: flex;
+}
+
+.removeTag:hover {
+  cursor: pointer;
+  background-color: var(--conduction-tag-remove-background-color);
+  color: var(--conduction-tag-remove-text-color);
+}

package/src/components/topNav/index.ts

@@ -1,4 +1,4 @@
-import { PrimaryTopNav } from "./primaryTopNav/PrimaryTopNav";
-import { SecondaryTopNav } from "./secondaryTopNav/SecondaryTopNav";
-
-export { PrimaryTopNav, SecondaryTopNav };
+import { PrimaryTopNav } from "./primaryTopNav/PrimaryTopNav";
+import { SecondaryTopNav } from "./secondaryTopNav/SecondaryTopNav";
+
+export { PrimaryTopNav, SecondaryTopNav };

package/src/custom.d.ts

@@ -1,4 +1,4 @@
-declare module "*.svg";
-declare module "*.jpg";
-declare module "*.png";
-declare module "*.module.css";
+declare module "*.svg";
+declare module "*.jpg";
+declare module "*.png";
+declare module "*.module.css";

package/src/index.ts

@@ -29,7 +29,7 @@ import { BadgeCounter } from "./components/badgeCounter/BadgeCounter";
 import { CodeBlock } from "./components/codeBlock/CodeBlock";
 import { ToolTip } from "./components/toolTip/ToolTip";
 import { Pagination } from "./components/Pagination/Pagination";
-import { TabContext } from "./components/tabs/Tabs";
+import { Tabs, TabList, Tab, TabPanel } from "./components/tabs/Tabs";
 
 export {
   DownloadCard,
@@ -63,5 +63,8 @@ export {
   BadgeCounter,
   CodeBlock,
   ToolTip,
-  TabContext,
+  Tabs,
+  TabList,
+  Tab,
+  TabPanel,
 };

package/lib/components/temp/Temp.d.ts

@@ -1,5 +0,0 @@
-import { ReactTabsFunctionComponent, TabProps, TabPanelProps, TabListProps, TabsProps } from "react-tabs";
-export declare const Tabs: ReactTabsFunctionComponent<TabsProps>;
-export declare const TabList: ReactTabsFunctionComponent<TabListProps>;
-export declare const Tab: ReactTabsFunctionComponent<TabProps>;
-export declare const TabPanel: ReactTabsFunctionComponent<TabPanelProps>;

package/lib/components/temp/Temp.js

@@ -1,14 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Tabs as RTabs, TabList as RTabList, Tab as RTab, TabPanel as RTabPanel, } from "react-tabs";
-// Tabs
-export const Tabs = ({ children, ...otherProps }) => (_jsx(RTabs, { ...otherProps, children: _jsx("h1", { children: children }) }));
-Tabs.tabsRole = "Tabs";
-// TabList
-export const TabList = ({ children, ...otherProps }) => (_jsx(RTabList, { ...otherProps, children: children }));
-TabList.tabsRole = "TabList";
-// Tab
-export const Tab = ({ children, ...otherProps }) => (_jsx(RTab, { ...otherProps, children: children }));
-Tab.tabsRole = "Tab";
-// TabPanel
-export const TabPanel = ({ children, ...otherProps }) => (_jsx(RTabPanel, { ...otherProps, children: children }));
-TabPanel.tabsRole = "TabPanel";