diff --git a/examples/stencil-components/vanilla-cdn/index.html b/examples/stencil-components/vanilla-cdn/index.html index c4287d3991..4a2c70fb27 100644 --- a/examples/stencil-components/vanilla-cdn/index.html +++ b/examples/stencil-components/vanilla-cdn/index.html @@ -235,14 +235,14 @@

Dropdown

dropdown - Header Text + Header Text - First + Menu Item - One - Two - Three - Four + Menu Item + Menu Item + Menu Item + Menu Item
diff --git a/examples/wrapper-components/react-javascript/package-lock.json b/examples/wrapper-components/react-javascript/package-lock.json index 639b54af8b..83a94b028b 100644 --- a/examples/wrapper-components/react-javascript/package-lock.json +++ b/examples/wrapper-components/react-javascript/package-lock.json @@ -21903,16 +21903,16 @@ } }, "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=14.17" + "node": ">=4.2.0" } }, "node_modules/uglify-js": { @@ -39332,9 +39332,9 @@ } }, "typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "peer": true }, "uglify-js": { diff --git a/examples/wrapper-components/react-javascript/src/components/Dropdown/Dropdown.js b/examples/wrapper-components/react-javascript/src/components/Dropdown/Dropdown.js index 8a37b1709e..1e682aa36b 100644 --- a/examples/wrapper-components/react-javascript/src/components/Dropdown/Dropdown.js +++ b/examples/wrapper-components/react-javascript/src/components/Dropdown/Dropdown.js @@ -13,10 +13,10 @@ function Dropdown() { Header Text - lorem10 + Menu Item - Link Item - Menu Item lorem10 + Menu Item + Menu Item ); diff --git a/examples/wrapper-components/react-typescript/src/components/Dropdown/Dropdown.tsx b/examples/wrapper-components/react-typescript/src/components/Dropdown/Dropdown.tsx index 4cf154027c..bee26aeba1 100644 --- a/examples/wrapper-components/react-typescript/src/components/Dropdown/Dropdown.tsx +++ b/examples/wrapper-components/react-typescript/src/components/Dropdown/Dropdown.tsx @@ -9,10 +9,10 @@ function Dropdown() { Header Text - lorem10 + Menu Item - Link Item - Menu Item lorem10 + Menu Item + Menu Item ); diff --git a/examples/wrapper-components/vue-javascript/src/components/Dropdown.vue b/examples/wrapper-components/vue-javascript/src/components/Dropdown.vue index 45f461d319..b3e0b95d91 100644 --- a/examples/wrapper-components/vue-javascript/src/components/Dropdown.vue +++ b/examples/wrapper-components/vue-javascript/src/components/Dropdown.vue @@ -8,12 +8,12 @@ Header Text - First + Menu Item - One - Two - Three - Four + Menu Item + Menu Item + Menu Item + Menu Item diff --git a/package-lock.json b/package-lock.json index ae6e1781f9..5424afa580 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22690,10 +22690,14 @@ } }, "node_modules/uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", "dev": true, + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], "bin": { "uuid": "dist/bin/uuid" } @@ -40391,9 +40395,9 @@ "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==" }, "uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", "dev": true }, "uvu": { diff --git a/packages/components-vue/lib/components.ts b/packages/components-vue/lib/components.ts index 7f629633b1..35d4995b80 100644 --- a/packages/components-vue/lib/components.ts +++ b/packages/components-vue/lib/components.ts @@ -154,8 +154,8 @@ export const IfxDropdownTrigger = /*@__PURE__*/ defineContainer('ifx-dropdown-trigger-button', undefined, [ 'isOpen', + 'theme', 'variant', - 'color', 'size', 'disabled', 'hideArrow' diff --git a/packages/components/src/components/dropdown/dropdown-trigger-button/dropdown-trigger-button.tsx b/packages/components/src/components/dropdown/dropdown-trigger-button/dropdown-trigger-button.tsx index 0e01d1a727..9be133161b 100644 --- a/packages/components/src/components/dropdown/dropdown-trigger-button/dropdown-trigger-button.tsx +++ b/packages/components/src/components/dropdown/dropdown-trigger-button/dropdown-trigger-button.tsx @@ -10,8 +10,9 @@ import { IOpenable } from '../IOpenable'; export class DropdownItem implements IOpenable { @Prop() isOpen: boolean = false; - @Prop() variant: 'primary' | 'secondary' | 'tertiary' = 'primary'; - @Prop() color: 'primary' | 'secondary' | 'success' | 'danger' | 'warning' = 'primary'; + + @Prop() theme: 'default' | 'danger' | 'inverse' = 'default'; + @Prop() variant: 'primary'; @Prop() size: 's' | 'm' = 'm'; @Prop() disabled: boolean; @Prop() hideArrow: boolean = false; @@ -20,7 +21,7 @@ export class DropdownItem implements IOpenable { return ( i['name']), @@ -87,29 +93,21 @@ export default { const DefaultTemplate = (args) => { const wrapper = document.createElement('div'); - wrapper.innerHTML = ` - ${args.label} - - Link Item - - Console log from click event - Item with Icon - - Boring Item - - `; + wrapper.innerHTML = ` + + dropdown + + + ${args.header ? `Header Text` : ""} + ${args.search ? `` : ""} + Menu Item + Menu Item + Menu Item + Menu Item + ${args.separator ? `` : ""} + Menu Item + +`; const dropdown = wrapper.querySelector('ifx-dropdown') as HTMLElement; const dropdownMenu = dropdown.querySelector('ifx-dropdown-menu'); @@ -139,12 +137,10 @@ const LabelTriggerTemplate = (args) => { Some more text - Link Item - - Console log from click event - Item with Icon - - Boring Item + Menu Item + Menu Item + Menu Item + Menu Item `; diff --git a/packages/components/src/index.html b/packages/components/src/index.html index 5bd2d52b0f..18b91da920 100644 --- a/packages/components/src/index.html +++ b/packages/components/src/index.html @@ -20,6 +20,7 @@ +