Merge branch 'main' into release-please--branches--main

juntossomosmais · Nov 6, 2024 · 361f9b1 · 361f9b1
2 parents a154115 + c5de2cb
commit 361f9b1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/packages/core/src/components/select/select.tsx b/packages/core/src/components/select/select.tsx
@@ -5,10 +5,10 @@ import {
   Element,
   Event,
   EventEmitter,
-  Host,
-  Prop,
   h,
+  Host,
   Method,
+  Prop,
 } from '@stencil/core'
 
 import { IconProps } from '../../icons'
@@ -50,7 +50,7 @@ export class AtomSelect {
   @Event() atomFocus!: EventEmitter<void>
 
   @Method()
-  setTagInSelectOptions() {
+  async setTagInSelectOptions() {
     /**
      * This method was necessary because the `ion-selection-option` loop does not allow customizations or custom components.
      * So, to be able to add custom elements such as a tag or a badge inside an option of the `select` field, when the select

diff --git a/packages/core/src/components/select/stories/select.core.stories.tsx b/packages/core/src/components/select/stories/select.core.stories.tsx
@@ -104,13 +104,18 @@ export const Multiple: StoryObj = {
 }
 
 const optionWithTag = [
-  ...optionsDefault,
   {
-    id: '3',
+    id: '1',
     value: 'Nice Green',
     disabled: false,
     tag: { color: 'success', label: 'New ' },
   },
+  {
+    id: '2',
+    value: 'Nice Red',
+    disabled: false,
+    tag: { color: 'danger', label: 'Old ' },
+  },
 ]
 
 export const WithTag: StoryObj = {

diff --git a/packages/core/src/components/select/stories/select.react.stories.tsx b/packages/core/src/components/select/stories/select.react.stories.tsx
@@ -92,13 +92,18 @@ export const Multiple: StoryObj = {
 }
 
 const optionWithTag = [
-  ...optionsDefault,
   {
-    id: '3',
+    id: '1',
     value: 'Nice Green',
     disabled: false,
     tag: { color: 'success', label: 'New ' },
   },
+  {
+    id: '2',
+    value: 'Nice Red',
+    disabled: false,
+    tag: { color: 'danger', label: 'Old ' },
+  },
 ]
 
 export const WithTag: StoryObj = {

diff --git a/packages/core/src/components/select/stories/select.vue.stories.tsx b/packages/core/src/components/select/stories/select.vue.stories.tsx
@@ -93,14 +93,20 @@ export const Multiple: StoryObj = {
     multiple: true,
   },
 }
+
 const optionWithTag = [
-  ...optionsDefault,
   {
-    id: '3',
+    id: '1',
     value: 'Nice Green',
     disabled: false,
     tag: { color: 'success', label: 'New ' },
   },
+  {
+    id: '2',
+    value: 'Nice Red',
+    disabled: false,
+    tag: { color: 'danger', label: 'Old ' },
+  },
 ]
 
 export const WithTag: StoryObj = {