Merge branch 'main' into dependabot/github_actions/geekyeggo/delete-a…

…rtifact-4
carbon-design-system · Jan 19, 2024 · ea3b095 · ea3b095
2 parents eb5b592 + 2186384
commit ea3b095
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 16 deletions.
diff --git a/.yarn/cache/@carbon-icons-npm-11.31.0-3bec00ed0e-da2ae3f51a.zip b/.yarn/cache/@carbon-icons-npm-11.31.0-3bec00ed0e-da2ae3f51a.zip
diff --git a/...ons-npm-11.32.0-ad4e2a2d6c-d0d1776877.zip → ...ons-npm-11.33.0-1c2a15b60f-a13b314eec.zip b/...ons-npm-11.32.0-ad4e2a2d6c-d0d1776877.zip → ...ons-npm-11.33.0-1c2a15b60f-a13b314eec.zip
diff --git a/packages/carbon-web-components/package.json b/packages/carbon-web-components/package.json
@@ -89,7 +89,7 @@
     "@babel/template": "~7.12.0",
     "@babel/traverse": "~7.23.0",
     "@carbon/icon-helpers": "10.45.1",
-    "@carbon/icons": "11.31.0",
+    "@carbon/icons": "11.33.0",
     "@open-wc/semantic-dom-diff": "~0.18.0",
     "@percy-io/in-percy": "^0.1.11",
     "@percy/cli": "^1.27.4",

diff --git a/packages/carbon-web-components/src/components/select/select.ts b/packages/carbon-web-components/src/components/select/select.ts
@@ -19,6 +19,7 @@ import FormMixin from '../../globals/mixins/form';
 import { filter } from '../../globals/internal/collection-helpers';
 import { INPUT_SIZE } from '../text-input/text-input';
 import styles from './select.scss';
+import ifNonEmpty from '../../globals/directives/if-non-empty';
 import { carbonElement as customElement } from '../../globals/decorators/carbon-element';
 
 /**
@@ -113,7 +114,7 @@ class CDSSelect extends FormMixin(LitElement) {
               <option
                 class="${prefix}--select-option"
                 ?disabled="${disabled}"
-                label="${ifDefined(label ?? textContent)}"
+                label="${ifNonEmpty(label)}"
                 ?selected="${selected}"
                 value="${ifDefined(value)}">
                 ${textContent}

diff --git a/packages/web-components/package.json b/packages/web-components/package.json
@@ -132,7 +132,7 @@
     "@babel/traverse": "~7.23.0",
     "@carbon/ibmdotcom-services-store": "1.53.0",
     "@carbon/icon-helpers": "10.45.1",
-    "@carbon/icons": "^11.31.0",
+    "@carbon/icons": "11.33.0",
     "@carbon/icons-react": "^11.33.0",
     "@carbon/pictograms-react": "11.55.0",
     "@carbon/react": "1.47.0",

diff --git a/yarn.lock b/yarn.lock
@@ -4370,7 +4370,7 @@ __metadata:
     "@carbon/ibmdotcom-styles": "npm:2.1.0"
     "@carbon/ibmdotcom-utilities": "npm:2.1.0"
     "@carbon/icon-helpers": "npm:10.45.1"
-    "@carbon/icons": "npm:^11.31.0"
+    "@carbon/icons": "npm:11.33.0"
     "@carbon/icons-react": "npm:^11.33.0"
     "@carbon/layout": "npm:11.20.1"
     "@carbon/motion": "npm:11.16.1"
@@ -4531,17 +4531,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/icons@npm:11.31.0":
-  version: 11.31.0
-  resolution: "@carbon/icons@npm:11.31.0"
-  checksum: da2ae3f51ad89f2f79eed671512cec09a6f7e6e77fef58418dbaa1471158d01ba792d2860262321de36912adfbd862ca23fdf5715970f04d8b6e782064372f2a
-  languageName: node
-  linkType: hard
-
-"@carbon/icons@npm:^11.31.0":
-  version: 11.32.0
-  resolution: "@carbon/icons@npm:11.32.0"
-  checksum: d0d177687794675ecb480bbd6ffd97be22aed2bf2900a234a65a769e38f11e2d876ab2eebe28ceecbd6e2b3077176ec5416f297318dd0d207674aac5f3a1938d
+"@carbon/icons@npm:11.33.0":
+  version: 11.33.0
+  resolution: "@carbon/icons@npm:11.33.0"
+  checksum: a13b314eec94c696ccea500e29ff42cc79f5b128d843ebd32eb4b30ed9315fdfa8295bb57841c160c6050a6e65a04654578489a2d9de092d00c2f293a43794d0
   languageName: node
   linkType: hard
 
@@ -4691,7 +4684,7 @@ __metadata:
     "@babel/template": "npm:~7.12.0"
     "@babel/traverse": "npm:~7.23.0"
     "@carbon/icon-helpers": "npm:10.45.1"
-    "@carbon/icons": "npm:11.31.0"
+    "@carbon/icons": "npm:11.33.0"
     "@carbon/styles": "npm:1.47.0"
     "@open-wc/semantic-dom-diff": "npm:~0.18.0"
     "@percy-io/in-percy": "npm:^0.1.11"