Merge branch 'main' into conditionbuilder6717

carbon-design-system · Jan 23, 2025 · 6e7aa37 · 6e7aa37
2 parents 1088157 + 37dba95
commit 6e7aa37
Show file tree

Hide file tree

Showing 18 changed files with 203 additions and 455 deletions.
diff --git a/packages/ibm-products-styles/src/components/ConditionBuilder/_condition-builder.scss b/packages/ibm-products-styles/src/components/ConditionBuilder/_condition-builder.scss
@@ -24,12 +24,6 @@
 // The block part of our conventional BEM class names (blockClass__E--M).
 $block-class: #{c4p-settings.$pkg-prefix}--condition-builder;
 
-// .#{$block-class} {
-//   // TODO: Styles.
-// }
-.#{$block-class} {
-  padding: $spacing-06;
-}
 .#{$block-class}__condition-builder__group {
   display: flex;
 }

diff --git a/packages/ibm-products-styles/src/components/TagOverflow/_tag-overflow.scss b/packages/ibm-products-styles/src/components/TagOverflow/_tag-overflow.scss
@@ -26,13 +26,8 @@ $block-class: #{c4p-settings.$pkg-prefix}--tag-overflow;
 $block-class-overflow: #{$block-class}-popover;
 $block-class-modal: #{$block-class}-modal;
 
-.#{$block-class} {
+.#{$block-class}__visible-tags {
   display: flex;
-  width: 100%;
-  min-width: $spacing-12;
-  align-items: center;
-  justify-content: flex-start;
-  white-space: nowrap;
 }
 
 .#{$block-class}--align-end {

diff --git a/packages/ibm-products-web-components/.storybook/main.ts b/packages/ibm-products-web-components/.storybook/main.ts
@@ -1,6 +1,5 @@
 import { mergeConfig } from 'vite';
 import { litStyleLoader, litTemplateLoader } from '@mordech/vite-lit-loader';
-import viteSVGResultCarbonIconLoader from '../tools/vite-svg-result-carbon-icon-loader';
 const glob = require('fast-glob');
 const stories = glob.sync(
   [
@@ -36,11 +35,7 @@ const config = {
   },
   async viteFinal(config) {
     return mergeConfig(config, {
-      plugins: [
-        litStyleLoader(),
-        litTemplateLoader(),
-        viteSVGResultCarbonIconLoader(),
-      ],
+      plugins: [litStyleLoader(), litTemplateLoader()],
     });
   },
 };

diff --git a/packages/ibm-products-web-components/package.json b/packages/ibm-products-web-components/package.json
@@ -12,21 +12,21 @@
     "url": "https://github.com/carbon-design-system/ibm-products.git",
     "directory": "packages/ibm-products-web-components"
   },
+  "files": [
+    "custom-elements.json",
+    "es/**/*",
+    "lib/**/*",
+    "scss/**/*"
+  ],
   "publishConfig": {
     "access": "public",
     "provenance": true
   },
   "exports": {
-    "./es/components/*": {
-      "node": "./lib/components/*",
-      "default": "./es/components/*"
-    },
-    "./es/globals/*": {
-      "node": "./lib/globals/*",
-      "default": "./es/globals/*"
-    },
     "./es/*": "./es/*",
     "./lib/*": "./lib/*",
+    "./dist/*": "./dist/*",
+    "./scss/*": "./scss/*",
     "./custom-elements.json": "./custom-elements.json",
     "./package.json": "./package.json"
   },
@@ -52,7 +52,8 @@
     "@carbon/ibm-products-styles": "^2.54.0-rc.0",
     "@carbon/styles": "1.71.0",
     "@carbon/web-components": "2.19.0",
-    "lit": "^3.1.0"
+    "lit": "^3.1.0",
+    "tslib": "^2.6.3"
   },
   "devDependencies": {
     "@carbon/icon-helpers": "^10.54.0",

diff --git a/packages/ibm-products-web-components/src/components/side-panel/side-panel.ts b/packages/ibm-products-web-components/src/components/side-panel/side-panel.ts
@@ -21,8 +21,8 @@ import { SIDE_PANEL_SIZE, SIDE_PANEL_PLACEMENT } from './defs';
 import styles from './side-panel.scss?lit';
 import { selectorTabbable } from '@carbon/web-components/es/globals/settings.js';
 import { carbonElement as customElement } from '@carbon/web-components/es/globals/decorators/carbon-element.js';
-import ArrowLeft16 from '@carbon/icons/lib/arrow--left/16';
-import Close20 from '@carbon/icons/lib/close/20';
+import ArrowLeft16 from '@carbon/web-components/es/icons/arrow--left/16';
+import Close20 from '@carbon/web-components/es/icons/close/20';
 import { moderate02 } from '@carbon/motion';
 import Handle from '../../globals/internal/handle';
 import '@carbon/web-components/es/components/button/index.js';

diff --git a/packages/ibm-products-web-components/tasks/build.js b/packages/ibm-products-web-components/tasks/build.js
@@ -12,8 +12,6 @@ import { globby } from 'globby';
 import { rollup } from 'rollup';
 import alias from '@rollup/plugin-alias';
 import autoprefixer from 'autoprefixer';
-import carbonIcons from '../tools/rollup-plugin-icons.js';
-import carbonIconPaths from '../tools/rollup-plugin-icon-paths.js';
 import commonjs from '@rollup/plugin-commonjs';
 import copy from 'rollup-plugin-copy';
 import cssnano from 'cssnano';
@@ -149,15 +147,13 @@ function getRollupConfig(input, rootDir, outDir, iconInput) {
           ).css;
         },
       }),
-      carbonIcons(iconInput, banner),
       typescript({
         noEmitOnError: true,
         compilerOptions: {
           rootDir,
           outDir,
         },
       }),
-      carbonIconPaths(),
     ],
   };
 }

diff --git a/packages/ibm-products-web-components/tools/rollup-plugin-icon-paths.js b/packages/ibm-products-web-components/tools/rollup-plugin-icon-paths.js
diff --git a/packages/ibm-products-web-components/tools/rollup-plugin-icons.js b/packages/ibm-products-web-components/tools/rollup-plugin-icons.js
diff --git a/packages/ibm-products-web-components/tools/svg-result-carbon-icon-loader.js b/packages/ibm-products-web-components/tools/svg-result-carbon-icon-loader.js
diff --git a/packages/ibm-products-web-components/tools/svg-result-carbon-icon.js b/packages/ibm-products-web-components/tools/svg-result-carbon-icon.js
diff --git a/packages/ibm-products-web-components/tools/vite-svg-result-carbon-icon-loader.ts b/packages/ibm-products-web-components/tools/vite-svg-result-carbon-icon-loader.ts
diff --git a/...ditionBuilder/ConditionBuilderItem/ConditionBuilderItemOption/ItemOptionForValueField.tsx b/...ditionBuilder/ConditionBuilderItem/ConditionBuilderItemOption/ItemOptionForValueField.tsx
@@ -177,11 +177,9 @@ export const ItemOptionForValueField = ({
 
       {multiSelectable && (
         <div className={`${blockClass}__multiselectSelectionStatusContainer`}>
-          <h4>
-            <label>
-              {selection.length}/{allOptions.length} Selected
-            </label>
-          </h4>
+          <label>
+            {selection.length}/{allOptions.length} Selected
+          </label>
           <Button
             kind={'ghost'}
             size={'sm'}