Merge remote-tracking branch 'origin/master' into docs

.github/workflows/npm-publish.yml

@@ -11,8 +11,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: lts/hydrogen
       - run: yarn
@@ -21,15 +21,15 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
           persist-credentials: false
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: lts/hydrogen
           registry-url: https://registry.npmjs.org/
-      - run: yarn --frozen-lockfile
+      - run: yarn
       - name: Setup submodule
         run: |
           cd polaris

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ownego/polaris-vue",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "polaris_version": "12.20.0",
   "description": "Shopify Polaris 12 - UI library for Vue 3",
   "author": "Ownego Team",
@@ -76,7 +76,7 @@
     "vue": "^3.4.19",
     "vue-component-meta": "^1.8.27",
     "vue-router": "^4.2.5",
-    "vue-tsc": "^1.8.27"
+    "vue-tsc": "^2.0.6"
   },
   "peerDependencies": {
     "vue": "^3.3"

src/components/Combobox/components/TextField/TextField.vue

@@ -51,7 +51,6 @@ import useId from '@/use/useId';
 import { useHasSlot } from '@/use/useHasSlot';
 import { useComboboxTextField } from '../../context';
 
-
 const props = withDefaults(defineProps<TextFieldProps>(), {
   type: 'text',
   ariaAutocomplete: 'list',

src/components/EventListener/EventListener.vue

@@ -1,5 +1,6 @@
 <script lang="ts">
 export default {
+  name: 'EventListener',
   inheritAttrs: false,
   render() {
     return null;
@@ -9,13 +10,10 @@ export default {
 <script setup lang="ts">
 import { onMounted, watch, onBeforeUnmount } from 'vue';
 
-interface BaseEventProps {
+type EventListenerProps = {
   event: string;
   capture?: boolean;
   handler(event: Event): void;
-}
-
-export interface EventListenerProps extends BaseEventProps {
   passive?: boolean;
 }
 

src/components/Modal/Modal.vue

@@ -28,7 +28,7 @@ Portal(
     <!-- body markup -->
     iframe(
       v-if="src",
-      :name="iFrameName",
+      :name="iframeName",
       :title="iframeTitle",
       :src="src",
       :class="styles.Iframe",
@@ -97,7 +97,7 @@ Portal(
 
   Backdrop(
     @closing="setClosing", 
-    @click="emits('close')",
+    @click="clickOutsideToClose ? emits('close') : undefined",
   )
 </template>
 
@@ -139,7 +139,7 @@ interface ModalProps {
   /** The url that will be loaded as the content of the modal */
   src?: string;
   /** The name of the modal content iframe */
-  iFrameName?: string;
+  iframeName?: string;
   /**
    * Hide the title in the modal
    * @default false
@@ -155,6 +155,8 @@ interface ModalProps {
   loading?: boolean;
   /** Removes Scrollable container from the modal content */
   noScroll?: boolean;
+  /** Click or tap the area outside to close the modal */
+  clickOutsideToClose?: boolean;
   /** Primary action */
   primaryAction?: ComplexAction;
   /** Collection of secondary actions */
@@ -185,6 +187,7 @@ export type ModalEvents = {
 
 withDefaults(defineProps<ModalProps>(), {
   titleHidden: false,
+  clickOutsideToClose: true,
 });
 
 defineSlots<ModalSlots>();

tsconfig.json

@@ -18,7 +18,7 @@
 
     // "noEmit": true,
     "moduleResolution": "node",
-    "allowImportingTsExtensions": true,
+    // "allowImportingTsExtensions": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",

yarn.lock

@@ -572,7 +572,7 @@
   dependencies:
     "@volar/source-map" "1.11.1"
 
-"@volar/[email protected]":
+"@volar/[email protected]", "@volar/language-core@~2.1.2":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.1.2.tgz#2053c0ee48a822d5418be2c192e51e580764b49f"
   integrity sha512-5qsDp0Gf6fE09UWCeK7bkVn6NxMwC9OqFWQkMMkeej8h8XjyABPdRygC2RCrqDrfVdGijqlMQeXs6yRS+vfZYA==
@@ -611,6 +611,14 @@
     "@volar/language-core" "1.11.1"
     path-browserify "^1.0.1"
 
+"@volar/typescript@~2.1.2":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.1.2.tgz#61f838cf4410e328a7ba638fadc41bb814772508"
+  integrity sha512-lhTancZqamvaLvoz0u/uth8dpudENNt2LFZOWCw9JZiX14xRFhdhfzmphiCRb7am9E6qAJSbdS/gMt1utXAoHQ==
+  dependencies:
+    "@volar/language-core" "2.1.2"
+    path-browserify "^1.0.1"
+
 "@vscode/l10n@^0.0.16":
   version "0.0.16"
   resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.16.tgz#f075db346d0b08419a12540171b230bd803c42be"
@@ -637,6 +645,17 @@
     estree-walker "^2.0.2"
     source-map-js "^1.0.2"
 
+"@vue/[email protected]":
+  version "3.4.21"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.21.tgz#868b7085378fc24e58c9aed14c8d62110a62be1a"
+  integrity sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==
+  dependencies:
+    "@babel/parser" "^7.23.9"
+    "@vue/shared" "3.4.21"
+    entities "^4.5.0"
+    estree-walker "^2.0.2"
+    source-map-js "^1.0.2"
+
 "@vue/[email protected]":
   version "3.4.4"
   resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.4.tgz#ba1ca008e95f118449cab79bdab3f7506bab2892"
@@ -672,6 +691,14 @@
     "@vue/compiler-core" "3.3.9"
     "@vue/shared" "3.3.9"
 
+"@vue/compiler-dom@^3.4.0":
+  version "3.4.21"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz#0077c355e2008207283a5a87d510330d22546803"
+  integrity sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==
+  dependencies:
+    "@vue/compiler-core" "3.4.21"
+    "@vue/shared" "3.4.21"
+
 "@vue/[email protected]":
   version "3.4.19"
   resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.19.tgz#33b238ded6d63e51f6a7048b742626f6007df129"
@@ -738,6 +765,19 @@
     path-browserify "^1.0.1"
     vue-template-compiler "^2.7.14"
 
+"@vue/[email protected]":
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-2.0.6.tgz#876f90622a3f801dce5cedcd6eae429d732152e2"
+  integrity sha512-UzqU12tzf9XLqRO3TiWPwRNpP4fyUzE6MAfOQWQNZ4jy6a30ARRUpmODDKq6O8C4goMc2AlPqTmjOHPjHkilSg==
+  dependencies:
+    "@volar/language-core" "~2.1.2"
+    "@vue/compiler-dom" "^3.4.0"
+    "@vue/shared" "^3.4.0"
+    computeds "^0.0.1"
+    minimatch "^9.0.3"
+    path-browserify "^1.0.1"
+    vue-template-compiler "^2.7.14"
+
 "@vue/language-plugin-pug@^2.0.6":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@vue/language-plugin-pug/-/language-plugin-pug-2.0.6.tgz#8f1e0a779076d926a8374507c621f8eecaf0589f"
@@ -820,6 +860,11 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.19.tgz#28105147811bcf1e6612bf1c9ab0c6d91ada019c"
   integrity sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==
 
+"@vue/[email protected]", "@vue/shared@^3.4.0":
+  version "3.4.21"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.21.tgz#de526a9059d0a599f0b429af7037cd0c3ed7d5a1"
+  integrity sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==
+
 "@vue/[email protected]":
   version "3.4.4"
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.4.tgz#26e4e62a5fbfb39c25e9e54d21eeb852f1c83a7a"
@@ -2699,13 +2744,13 @@ vue-template-compiler@^2.7.14:
     de-indent "^1.0.2"
     he "^1.2.0"
 
-vue-tsc@^1.8.27:
-  version "1.8.27"
-  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.8.27.tgz#feb2bb1eef9be28017bb9e95e2bbd1ebdd48481c"
-  integrity sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==
+vue-tsc@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-2.0.6.tgz#29cb195ffea63d66ec70b64eb4aadc6cd162bb12"
+  integrity sha512-kK50W4XqQL34vHRkxlRWLicrT6+F9xfgCgJ4KSmCHcytKzc1u3c94XXgI+CjmhOSxyw0krpExF7Obo7y4+0dVQ==
   dependencies:
-    "@volar/typescript" "~1.11.1"
-    "@vue/language-core" "1.8.27"
+    "@volar/typescript" "~2.1.2"
+    "@vue/language-core" "2.0.6"
     semver "^7.5.4"
 
 vue@^3.4.19: