Merge branch 'dev' into dris0000/sort-handle-firefox-fix

Esri · Jan 14, 2025 · 3e60888 · 3e60888
2 parents d910193 + 1cc97fb
commit 3e60888
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -6,10 +6,10 @@ check_ui_icon_name_consistency() {
   valid_pattern="^[a-z0-9-]+-(16|24|32)(-f)?\\.svg$"
 
   # this pattern will check for invalid use of "-f-" anywhere except right before the size
-  invalid_pattern="-[a-z0-9]+-f-"
+  invalid_pattern="\-[a-z0-9]+-f-"
 
   staged_files="$(
-    git diff --cached --name-only --diff-filter=ACM -- packages/calcite-ui-icons/icons/*.svg
+    git diff --cached --name-only --diff-filter=ACM | grep -E "packages/calcite-ui-icons/icons/.*\.svg" || true
   )"
 
   if [ -n "$staged_files" ]; then

diff --git a/packages/calcite-components/src/components/combobox/combobox.e2e.ts b/packages/calcite-components/src/components/combobox/combobox.e2e.ts
@@ -140,7 +140,7 @@ describe("calcite-combobox", () => {
     `);
   });
 
-  describe("accessible with item group", () => {
+  describe.skip("accessible with item group", () => {
     accessible(html`
       <calcite-combobox label="Trees" value="Trees">
         <calcite-combobox-item-group label="Conifers">
@@ -150,7 +150,7 @@ describe("calcite-combobox", () => {
     `);
   });
 
-  describe("accessible with open selected items", () => {
+  describe.skip("accessible with open selected items", () => {
     accessible(html`
       <calcite-combobox open label="Trees" value="Trees">
         <calcite-combobox-item-group label="Conifers">