@digigov/css 2.0.0-60d81ed8 → 2.0.0-6452adf3

package/index.js

@@ -1,66 +1,92 @@
-const path = require("path");
+const path = require('path');
 
-var digigovCssInfo = require(path.join(__dirname,'./package.json'))
-const digigovTailwindConfig = require(path.join(__dirname,'./tailwind.config.js'));
+var digigovCssInfo = require(path.join(__dirname, './package.json'));
+const digigovTailwindConfig = require(
+  path.join(__dirname, './tailwind.config.js')
+);
 
-const base = require(path.join(__dirname,'./dist/base'))
-const utilities = require(path.join(__dirname,'./dist/utilities'))
-const components = require(path.join(__dirname,'./dist/components'))
+const getThemeBaseStyle = require(path.join(__dirname, './theming.js'));
 
-const mainFunction = ({ addBase, addComponents, addUtilities, config }) => {
-	let digigovCssIncludedItems = []
-	let logs = false
-	if (config('digigovCss.logs') != false) {
-		logs = true
-	}
-	if (logs) {
-		console.log()
-		console.log('\x1b[35m%s\x1b[0m', '🌼 Digigov CSS components ' + digigovCssInfo.version, '\x1b[0m', digigovCssInfo.homepage)
-		console.group()
-	}
+const base = require(path.join(__dirname, './dist/base'));
+const utilities = require(path.join(__dirname, './dist/utilities'));
+const components = require(path.join(__dirname, './dist/components'));
 
-	// inject @base style 
-	if (config('digigovCss.base') != false) {
-		addBase(base)
-		digigovCssIncludedItems.push('base')
-	}
+/**
+ * Load Digigov CSS styles and add them to the base tailwindcss styles.
+ *
+ * Optionally, you can provide additional options for loading a custom theme.
+ *
+ * @param {object} [options={}]
+ * @param {string} [options.customTheme] - Custom theme package name or file path.
+ * @param {boolean} [options.eject] - Whether to ignore the default Digigov CSS base styles.
+ */
+function mainFunction(options = {}) {
+  return function ({ addBase, addComponents, addUtilities, config }) {
+    let digigovCssIncludedItems = [];
+    let logs = false;
+    if (config('digigovCss.logs') != false) {
+      logs = true;
+    }
+    if (logs) {
+      console.log();
+      console.log(
+        '\x1b[35m%s\x1b[0m',
+        '🌼 Digigov CSS components ' + digigovCssInfo.version,
+        '\x1b[0m',
+        digigovCssInfo.homepage
+      );
+      console.group();
+    }
 
-	// inject components
-	let classNames = [];
-	let mediaQueries = [];
-	// split compiled components in two different sectors
-	// to load them in the correct order, since media queries
-	// should be always after the main CSS rules
-	Object.keys(components).forEach(selector => {
-		// checking if selectors are media queries
-		if (selector.startsWith('@media')) {
-			mediaQueries.push({[selector]: components[selector]});
-		// ... or just regular css rules
-		} else {
-			classNames.push({[selector]: components[selector]});
-		}
-	});
-	if (config('digigovCss.components') != false) {
-		// this order is important for loading CSS rules and media queries
-		// consistently, since the keys in js objects are not ordered and 
-		// sometimes order can be different. By spreading them in sequence 
-		// we fix this bug
-		addComponents([
-			...classNames,
-			...mediaQueries,
-		])
-		digigovCssIncludedItems.push('components')
-	}
+    // inject @base style
+    if (config('digigovCss.base') != false) {
+      const themeBaseStyle = getThemeBaseStyle({
+        eject: options.eject,
+        theme: options.customTheme,
+        debug: logs,
+      });
+      addBase({ ...base, ...themeBaseStyle });
+      digigovCssIncludedItems.push('base');
+    }
 
-	// inject @utilities style needed by components
-	if (config('digigovCss.utils') != false) {
-		addUtilities(utilities)
-		digigovCssIncludedItems.push('utilities')
-	}
-	if (logs) {
-		console.log('\x1b[32m%s\x1b[0m', '✔︎ Including:', '\x1b[0m', '' + digigovCssIncludedItems.join(', '));
-		if (isTailwindInstalled === false) {
-			console.log(`\n\x1b[33;1m! warning\x1b[0m - unable to require \x1b[36mtailwindcss/plugin\x1b[0m
+    // inject components
+    let classNames = [];
+    let mediaQueries = [];
+    // split compiled components in two different sectors
+    // to load them in the correct order, since media queries
+    // should be always after the main CSS rules
+    Object.keys(components).forEach((selector) => {
+      // checking if selectors are media queries
+      if (selector.startsWith('@media')) {
+        mediaQueries.push({ [selector]: components[selector] });
+        // ... or just regular css rules
+      } else {
+        classNames.push({ [selector]: components[selector] });
+      }
+    });
+    if (config('digigovCss.components') != false) {
+      // this order is important for loading CSS rules and media queries
+      // consistently, since the keys in js objects are not ordered and
+      // sometimes order can be different. By spreading them in sequence
+      // we fix this bug
+      addComponents([...classNames, ...mediaQueries]);
+      digigovCssIncludedItems.push('components');
+    }
+
+    // inject @utilities style needed by components
+    if (config('digigovCss.utils') != false) {
+      addUtilities(utilities);
+      digigovCssIncludedItems.push('utilities');
+    }
+    if (logs) {
+      console.log(
+        '\x1b[32m%s\x1b[0m',
+        '🛠️ Including functions:',
+        '\x1b[0m',
+        '' + digigovCssIncludedItems.join(', ')
+      );
+      if (isTailwindInstalled === false) {
+        console.log(`\n\x1b[33;1m! warning\x1b[0m - unable to require \x1b[36mtailwindcss/plugin\x1b[0m
 Digigov CSS color are now only available for Digigov CSS components.
 If you want to use DigigovCSS color as utility classes (like 'bg-primary')
 you need to add this to your \x1b[36mtailwind.config.js\x1b[0m file:
@@ -73,25 +99,29 @@ you need to add this to your \x1b[36mtailwind.config.js\x1b[0m file:
   },\x1b[0m
 \x1b[36m}\x1b[0m
 ───────────────────────────────────────  
-      `)
-		}
-		console.log()
-		console.groupEnd()
-	}
+      `);
+      }
+      console.log();
+      console.groupEnd();
+    }
+  };
 }
 
 // check if tailwindcss package exists
 let isTailwindInstalled = false;
 try {
-	require.resolve('tailwindcss/plugin')
-	isTailwindInstalled = true
+  require.resolve('tailwindcss/plugin');
+  isTailwindInstalled = true;
 } catch (er) {
-	isTailwindInstalled = false
+  isTailwindInstalled = false;
 }
 if (isTailwindInstalled !== false) {
-	module.exports = require("tailwindcss/plugin")(
-		mainFunction, digigovTailwindConfig
-	);
+  module.exports = require('tailwindcss/plugin').withOptions(
+    mainFunction,
+    function (options) {
+      return { ...digigovTailwindConfig, ...options };
+    }
+  );
 } else {
-	module.exports = mainFunction;
+  module.exports = mainFunction;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/css",
-  "version": "2.0.0-60d81ed8",
+  "version": "2.0.0-6452adf3",
   "description": "Digigov CSS - Tailwind CSS Components",
   "author": "GRNET Devs <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
@@ -27,7 +27,7 @@
     "defaultTheme",
     "src",
     "colors",
-    "themes.plugin.js",
+    "theming.js",
     "postcss.config.js",
     "tailwind.config.js",
     "screens.json"
@@ -39,10 +39,8 @@
     ]
   },
   "devDependencies": {
-    "@digigov/cli": "1.1.2-60d81ed8",
+    "@digigov/cli": "2.0.0-6452adf3",
     "autoprefixer": "10.4.16",
-    "cssnano": "4.1.10",
-    "postcss": "8.4.4",
     "postcss-cli": "8.3.0",
     "postcss-import": "13.0.0",
     "prejss-cli": "0.3.3",
@@ -50,21 +48,23 @@
     "tailwindcss": "3.3.5",
     "nodemon": "2.0.7",
     "next": "13.1.1",
-    "@digigov/postcss-banner": "1.0.5-60d81ed8",
-    "@digigov/cli-build-tailwind": "1.0.2-60d81ed8",
+    "@digigov/postcss-banner": "1.0.5-6452adf3",
+    "@digigov/cli-build-tailwind": "2.0.0-6452adf3",
     "rimraf": "3.0.2",
     "publint": "0.1.8",
     "stylelint": "15.11.0",
-    "stylelint-plugin-digigov": "1.1.0-60d81ed8",
+    "stylelint-plugin-digigov": "1.1.0-6452adf3",
     "prettier": "3.2.5"
   },
   "dependencies": {
+    "@digigov/theme-default": "1.0.0-6452adf3",
     "@fontsource/roboto": "4.4.0",
+    "cssnano": "4.1.10",
     "publint": "0.1.8",
-    "@adobe/leonardo-contrast-colors": "1.0.0-alpha.13",
-    "polished": "4.2.2",
+    "postcss": "8.4.4",
     "postcss-js": "4.0.0",
-    "postcss-load-config": "3.1.4"
+    "postcss-load-config": "3.1.4",
+    "postcss-sort-media-queries": "5.2.0"
   },
   "scripts": {
     "preutilities": "DIGIGOV_CSS_BUILD=TRUE postcss --config src/utilities src/utilities/index.css --base src --dir dist",

package/postcss.config.js

@@ -1,14 +1,14 @@
-
 /** @type {import('postcss-load-config').Config} */
 const config = {
   plugins: {
-    "postcss-import": {},
-    "tailwindcss/nesting": {},
+    'postcss-import': {},
+    'tailwindcss/nesting': {},
     tailwindcss: {},
     autoprefixer: {},
+    'postcss-sort-media-queries': {},
     cssnano: {
       preset: [
-        "default",
+        'default',
         {
           mergeRules: false,
         },

package/src/base/index.css

@@ -1,4 +1,5 @@
 @import 'tailwindcss/base';
+
 :root {
   accent-color: var(--color-accent);
 }

package/src/base/postcss.config.js

@@ -1,27 +1,28 @@
-const changeLog = require("../../CHANGELOG.json");
+const changeLog = require('../../CHANGELOG.json');
 const entries = changeLog.entries.sort(
-  (a, b) => new Date(b.date) - new Date(a.date),
+  (a, b) => new Date(b.date) - new Date(a.date)
 );
 const version = entries[0].version;
 const date = entries[0].date;
-const cssDate = new Date(date).toLocaleDateString("si-LK"); //yyyy-MM-dd
+const cssDate = new Date(date).toLocaleDateString('si-LK'); //yyyy-MM-dd
 
 /** @type {import('postcss-load-config').Config} */
 const config = {
   plugins: [
-    require("postcss-import"),
-    require("tailwindcss/nesting"),
-    require("tailwindcss")("./src/base/tailwind.config.js"),
-    require("autoprefixer"),
-    require("cssnano")({
+    require('postcss-import'),
+    require('tailwindcss/nesting'),
+    require('tailwindcss')('./src/base/tailwind.config.js'),
+    require('autoprefixer'),
+    require('postcss-sort-media-queries'),
+    require('cssnano')({
       preset: [
-        "default",
+        'default',
         {
           mergeRules: false,
         },
       ],
     }),
-    require("@digigov/postcss-banner")({
+    require('@digigov/postcss-banner')({
       banner: `@digigov/css: ${version}\n\nAuthor: grnet-devs\nDate: ${cssDate}`,
       inline: false,
       important: true,

package/src/base/tailwind.config.js

@@ -1,21 +1,14 @@
-const plugin = require("tailwindcss/plugin");
-const themesPlugin = require("../../themes.plugin");
-const tailwindConfig = require("../../tailwind.config");
+const tailwindConfig = require('../../tailwind.config');
 
 /** @type {import('tailwindcss').Config} */
 module.exports = {
   ...tailwindConfig,
   content: {
     files: [
-      "./*.css",
-      "../../dist/components/*.css",
-      "../../dist/utilities/*.css",
+      './*.css',
+      '../../dist/components/*.css',
+      '../../dist/utilities/*.css',
     ],
     relative: true,
   },
-  themes: {
-    light: require.resolve("../../../../themes/govgr-light"),
-    dark: require.resolve("../../../../themes/govgr-dark"),
-  },
-  plugins: [plugin(themesPlugin)],
 };

package/src/components/button.common.css

@@ -5,7 +5,7 @@
 
 @layer utilities {
   .util-btn {
-    @apply m-0 mb-4 md:mb-8 flex items-center;
+    @apply m-0 mb-4 md:mb-8 flex items-center gap-x-3;
     border-radius: var(--btn-border-radius);
     padding-right: var(--btn-padding-x);
     padding-left: var(--btn-padding-x);

package/src/components/button.css

@@ -3,7 +3,7 @@
 .ds-btn[type='submit'],
 .ds-btn[type='button'],
 .ds-btn[type='reset'] {
-  @apply util-btn util-btn-text min-h-10 md:min-h-12 w-max cursor-pointer gap-x-3;
+  @apply util-btn util-btn-text min-h-10 md:min-h-12 w-max cursor-pointer;
   &:focus {
     box-shadow:
       0 0 0 2px var(--color-white),

package/src/components/button.native.css

@@ -4,8 +4,8 @@
 
 .ds-btn {
   @apply util-btn min-h-4 flex-row flex-nowrap justify-center;
-  border-bottom-width: 2px;
-  border-bottom-color: var(--color-base-content);
+  border-bottom-width: var(--btn-border-bottom-width-native);
+  border-bottom-color: var(--btn-border-bottom-color-native);
   padding-top: calc( 1.5 * var(--btn-padding-y)) !important;
   padding-bottom: calc( 1.5 * var(--btn-padding-y)) !important;
 }
@@ -51,6 +51,5 @@
   @apply util-btn-cta-text;
 }
 .ds-btn-cta__icon {
-  @apply ml-2;
   fill: var(--color-white) !important;
 }

package/src/components/copy-to-clipboard.css

@@ -35,7 +35,7 @@
     }
   }
   .ds-copy-to-clipboard__message {
-    @apply bg-success py-4 px-6 absolute mt-4 text-center z-50 w-fit md:w-max;
+    @apply bg-success py-4 px-6 absolute mt-4 text-center z-40 w-fit md:w-max;
     &::before {
       @apply w-4 h-4 border-t-8 border-l-8 border-success transform rotate-45
       absolute -top-1;

package/src/components/drawer.css

@@ -1,16 +1,33 @@
+.ds-drawer-container {
+  @apply justify-center items-center content-center
+  left-0 top-0 w-full h-full overflow-auto
+  flex fixed z-50 bg-opacity-50 bg-base-700;
+  &.ds-drawer-container--relative-sm {
+    @apply sm:bg-transparent sm:z-0 sm:relative sm:block;
+  }
+  &.ds-drawer-container--relative-md {
+    @apply md:bg-transparent md:z-0 md:relative md:block;
+  }
+  &.ds-drawer-container--relative-lg {
+    @apply lg:bg-transparent lg:z-0 lg:relative lg:block;
+  }
+  &.ds-drawer-container--closed {
+    @apply hidden;
+  }
+}
 .ds-drawer {
   @apply border border-base-300 bg-base-100 p-4
   h-full max-h-screen min-h-screen overflow-y-scroll w-4/5 max-w-md flex flex-col
   fixed top-0 bottom-0 z-40;
   @apply shadow-thick !important;
   &.ds-drawer--relative-sm {
-    @apply sm:relative sm:w-full max-h-full shadow-thick sm:shadow-none !important;
+    @apply sm:relative sm:w-full sm:min-h-fit shadow-thick sm:shadow-none !important;
   }
   &.ds-drawer--relative-md {
-    @apply md:relative md:w-full max-h-full shadow-thick md:shadow-none !important;
+    @apply md:relative md:w-full md:min-h-fit shadow-thick md:shadow-none !important;
   }
   &.ds-drawer--relative-lg {
-    @apply lg:relative lg:w-full max-h-full shadow-thick lg:shadow-none !important;
+    @apply lg:relative lg:w-full lg:min-h-fit shadow-thick lg:shadow-none !important;
   }
   &.ds-drawer--right {
     @apply right-0;
@@ -37,6 +54,9 @@
 }
 .ds-drawer__heading {
   @apply p-0 mb-2 md:mb-4 flex justify-between align-baseline;
+  &:has(.ds-close-btn:only-child) {
+    @apply justify-end;
+  }
   .ds--drawer__close-icon {
     @apply m-0;
   }

package/src/components/filter.css

@@ -1,40 +1,63 @@
+.ds-filter-container {
+  @apply fixed left-0 top-0 overflow-auto w-full h-full
+  flex justify-center items-center content-center
+  z-50 bg-opacity-50 bg-base-700;
+  &.ds-filter-container--position-relative-always {
+    @apply bg-transparent h-fit z-2 overflow-visible relative block !important;
+  }
+  &.ds-filter-container--position-relative-sm {
+    @apply sm:bg-transparent sm:h-fit sm:z-2 sm:overflow-visible sm:relative;
+    @apply sm:block !important;
+  }
+  &.ds-filter-container--position-relative-md {
+    @apply md:bg-transparent md:h-fit md:z-2 md:overflow-visible md:relative;
+    @apply md:block !important;
+  }
+  &.ds-filter-container--position-relative-lg {
+    @apply lg:bg-transparent lg:h-fit lg:z-2 lg:overflow-visible lg:relative;
+    @apply lg:block !important;
+  }
+  &.ds-filter-container--closed {
+    @apply hidden;
+  }
+}
 .ds-filter {
-  @apply bg-base-100 fixed top-0 right-0 bottom-0 overflow-y-scroll z-40 w-4/5;
+  @apply bg-base-100 fixed top-0 right-0 bottom-0 overflow-y-scroll w-4/5 max-w-md p-4;
   box-shadow: 0 0 30px rgba(var(--color-base-900-rgb), 0.9);
   &.ds-filter--position-relative-always {
-    @apply block relative overflow-visible w-full shadow-none z-2 !important;
-    &.ds-filter--closed {
-      @apply block !important;
-    }
+    @apply relative w-full max-w-full shadow-none mb-4 md:mb-8;
   }
   &.ds-filter--position-relative-sm {
-    @apply sm:block sm:relative sm:overflow-visible sm:w-full sm:shadow-none sm:z-2;
-    &.ds-filter--closed {
-      @apply sm:block;
+    @apply sm:relative sm:w-full sm:shadow-none sm:mb-4 md:mb-8 sm:max-w-full;
+    &:not(.ds-filter--border) {
+      @apply sm:p-0;
     }
   }
   &.ds-filter--position-relative-md {
-    @apply md:block md:relative md:overflow-visible md:w-full md:shadow-none md:z-2;
-    &.ds-filter--closed {
-      @apply md:block;
+    @apply md:relative md:w-full md:shadow-none md:mb-8 md:max-w-full;
+    &:not(.ds-filter--border) {
+      @apply md:p-0;
     }
   }
   &.ds-filter--position-relative-lg {
-    @apply lg:block lg:relative lg:overflow-visible lg:w-full lg:shadow-none lg:z-2;
-    &.ds-filter--closed {
-      @apply lg:block;
+    @apply lg:relative lg:overflow-visible lg:w-full lg:shadow-none 
+    lg:z-2 lg:mb-8 lg:max-w-full;
+    &:not(.ds-filter--border) {
+      @apply lg:p-0;
     }
   }
   &.ds-filter--border {
-    @apply border border-base-300 p-4;
-  }
-  &.ds-filter--closed {
-    @apply hidden;
+    @apply border border-base-300;
   }
 }
 .ds-filter__content {
   @apply flex flex-col gap-8 p-0;
 }
+.ds-filter__options {
+  .ds-btn:last-child {
+    @apply mb-0;
+  }
+}
 .ds-filter__options--horizontal {
   @apply flex gap-4 flex-col;
   @apply md:flex-row md:flex-wrap;
@@ -51,13 +74,13 @@
   @apply p-0;
 }
 .ds-filter__heading {
-  @apply mb-2 md:mb-4;
+  @apply mb-4 md:mb-8 flex justify-between align-baseline items-baseline;
 }
 .ds-filter__selected {
   @apply bg-base-200 p-4 m-0 rounded;
 }
 .ds-filter__selected-heading {
-  @apply flex flex-wrap sm:flex-nowrap mb-4 md:mb-8 justify-between gap-x-2 gap-y-4;
+  @apply flex flex-wrap mb-4 md:mb-8 justify-between gap-x-2 gap-y-4;
 }
 .ds-input__search-btn {
   @apply shadow-none mb-0 !important;
@@ -85,8 +108,34 @@
 /* overrides */
 
 .ds-filter {
-  @apply bg-base-100 fixed top-0 right-0 bottom-0 overflow-y-scroll z-40 w-4/5;
-  box-shadow: 0 0 30px rgba(var(--color-base-900-rgb), 0.9);
+  &.ds-filter--position-relative-always {
+    .ds-filter__heading {
+      > .ds-close-btn {
+        @apply hidden;
+      }
+    }
+  }
+  &.ds-filter--position-relative-sm {
+    .ds-filter__heading {
+      > .ds-close-btn {
+        @apply sm:hidden;
+      }
+    }
+  }
+  &.ds-filter--position-relative-md {
+    .ds-filter__heading {
+      > .ds-close-btn {
+        @apply md:hidden;
+      }
+    }
+  }
+  &.ds-filter--position-relative-lg {
+    .ds-filter__heading {
+      > .ds-close-btn {
+        @apply lg:hidden;
+      }
+    }
+  }
   .ds-select {
     @apply w-full;
   }

package/src/components/kitchensink.css

@@ -40,10 +40,10 @@
   .ds-dropdown {
     margin-bottom: 20rem;
   }
-  .ds-modal__body {
+  .ds-modal {
     margin: 1rem;
   }
-  .ds-modal {
+  .ds-modal-container {
     position: inherit;
   }
 }

package/src/components/loader.common.css

@@ -0,0 +1,7 @@
+@tailwind utilities;
+
+@layer utilities {
+  .util-loader {
+    @apply m-auto overflow-hidden;
+  }
+}

package/src/components/loader.css

@@ -1,5 +1,7 @@
+@import './loader.common.css';
+
 .ds-loader {
-  @apply h-fit w-fit m-auto overflow-hidden print:hidden;
+  @apply util-loader h-fit w-fit print:hidden;
 }
 .ds-circular-progress {
   @apply w-fit h-10;

package/src/components/loader.native.css

@@ -0,0 +1,5 @@
+@import './loader.common.css';
+
+.ds-loader {
+  @apply util-loader;
+}

package/src/components/modal.common.css

@@ -1,10 +1,10 @@
 @tailwind utilities;
 
 @layer utilities {
-  .util-modal__body {
+  .util-modal {
     @apply bg-base-100 p-6 border border-solid border-base-500;
   }
-  .util-modal__container {
+  .util-modal__body {
     @apply gap-6 -my-4;
   }
   .util-modal__content-text {

package/src/components/modal.css

@@ -1,31 +1,31 @@
 @import './modal.common.css';
 
-.ds-modal {
+.ds-modal-container {
   @apply hidden justify-center items-center content-center text-left
   text-base-content bg-opacity-50 bg-base-700
   fixed z-50 left-0 top-0 w-full h-full overflow-auto;
 
-  &.ds-modal--open {
+  &.ds-modal-container--open {
     @apply flex;
   }
 
-  &.ds-modal--dense,
+  &.ds-modal-container--dense,
   &.ds-dense & {
-    .ds-modal__body {
+    .ds-modal {
       @apply px-4 py-0;
     }
-    .ds-modal__container {
+    .ds-modal__body {
       @apply gap-4 my-0;
     }
   }
 }
-.ds-modal__body {
-  @apply util-modal__body w-full max-w-md md:max-w-lg lg:max-w-4xl 
+.ds-modal {
+  @apply util-modal w-full max-w-md md:max-w-lg lg:max-w-4xl 
   h-fit md:h-auto overflow-y-auto;
   max-height: 95vh;
 }
-.ds-modal__container {
-  @apply grid util-modal__container;
+.ds-modal__body {
+  @apply grid util-modal__body;
   .ds-modal__action {
     @apply mb-0;
   }