diff --git a/package.json b/package.json index fee5971a..c8abec57 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,7 @@ "prepublishOnly": "yarn build" }, "dependencies": { - "bin-links": ">=1.1.6", - "carbon-icons-svelte": "^10.8.1", + "carbon-icons-svelte": "^10.8.2", "flatpickr": "^4.6.3" }, "peerDependencies": { diff --git a/src/components/ComboBox/ComboBox.Story.svelte b/src/components/ComboBox/ComboBox.Story.svelte deleted file mode 100644 index 652f51ec..00000000 --- a/src/components/ComboBox/ComboBox.Story.svelte +++ /dev/null @@ -1,53 +0,0 @@ - - - -

Currently, this component does not support items as slots.

-

- items - must be an array of objects; mandatory fields are `id` and `text`. -

-
-    {'items = Array<{ id: string; text: string; }>'}
-  
-
- - -
-
- -
-
diff --git a/src/components/ComboBox/ComboBox.stories.js b/src/components/ComboBox/ComboBox.stories.js deleted file mode 100644 index acfc0a76..00000000 --- a/src/components/ComboBox/ComboBox.stories.js +++ /dev/null @@ -1,24 +0,0 @@ -import { withKnobs, select, boolean, text } from '@storybook/addon-knobs'; -import Component from './ComboBox.Story.svelte'; - -export default { title: 'ComboBox', decorators: [withKnobs] }; - -const sizes = { - 'Extra large size (xl)': 'xl', - 'Regular size (lg)': '', - 'Small size (sm)': 'sm' -}; - -export const Default = () => ({ - Component, - props: { - size: select('Field size (size)', sizes, ''), - placeholder: text('Placeholder text (placeholder)', 'Filter...'), - titleText: text('Title (titleText)', 'Combobox title'), - helperText: text('Helper text (helperText)', 'Optional helper text here'), - light: boolean('Light (light)', false), - disabled: boolean('Disabled (disabled)', false), - invalid: boolean('Invalid (invalid)', false), - invalidText: text('Invalid text (invalidText)', 'A valid value is required') - } -}); diff --git a/src/components/ComboBox/ComboBox.svelte b/src/components/ComboBox/ComboBox.svelte deleted file mode 100644 index f487980b..00000000 --- a/src/components/ComboBox/ComboBox.svelte +++ /dev/null @@ -1,188 +0,0 @@ - - - { - if (open && inputRef && !inputRef.contains(target)) { - open = false; - } - }} /> - -
- {#if titleText} - - {/if} - {#if helperText} -
- {helperText} -
- {/if} - - { - open = true; - }} - {id} - {disabled} - {translateWithId}> - { - inputValue = target.value; - }} - on:keydown - on:keydown|stopPropagation={({ key }) => { - if (key === 'Enter') { - open = !open; - if (highlightedIndex > -1 && highlightedIndex !== selectedIndex) { - selectedIndex = highlightedIndex; - open = false; - } - } else if (key === 'Tab') { - open = false; - } else if (key === 'ArrowDown') { - change(1); - } else if (key === 'ArrowUp') { - change(-1); - } - }} - on:focus - on:blur - on:blur={({ relatedTarget }) => { - if (relatedTarget && relatedTarget.getAttribute('role') !== 'button') { - inputRef.focus(); - } - }} - {disabled} - {placeholder} - {id} - value={inputValue} /> - {#if invalid} - - {/if} - {#if inputValue} - { - selectedIndex = -1; - open = false; - }} - {translateWithId} - {disabled} - {open} /> - {/if} - { - open = !open; - }} - {translateWithId} - {open} /> - - {#if open} - - {#each filteredItems as item, i (item.id || i)} - { - selectedId = item.id; - selectedIndex = items.map(({ id }) => id).indexOf(filteredItems[i].id); - open = false; - }} - on:mouseenter={() => { - highlightedIndex = i; - }}> - {itemToString(item)} - - {/each} - - {/if} - -
diff --git a/src/components/ComboBox/index.js b/src/components/ComboBox/index.js deleted file mode 100644 index f6e61b53..00000000 --- a/src/components/ComboBox/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import ComboBox from './ComboBox.svelte'; - -export default ComboBox; diff --git a/src/components/DataTable/DataTable.Story.svelte b/src/components/DataTable/DataTable.Story.svelte deleted file mode 100644 index e1640bdc..00000000 --- a/src/components/DataTable/DataTable.Story.svelte +++ /dev/null @@ -1,152 +0,0 @@ - - - - {#if story === 'composed'} - - - - - - {#each props.headers as header, i (header.key)} - {header.header} - {/each} - - - - {#each props.rows as row, i} - - {#each row.cells as cell, j} - {cell.value} - {/each} - - {/each} - -
-
-
- {:else if story === 'sortable'} - { - console.log('on:click', detail); - }} - on:click:header={({ detail }) => { - console.log('on:click:header', detail); - }} - on:click:row={({ detail }) => { - console.log('on:click:row', detail); - }} - on:click:cell={({ detail }) => { - console.log('on:click:cell', detail); - }} - {rows} - {headers} /> - {:else} - { - console.log('on:click', detail); - }} - on:click:header={({ detail }) => { - console.log('on:click:header', detail); - }} - on:click:row={({ detail }) => { - console.log('on:click:row', detail); - }} - on:click:cell={({ detail }) => { - console.log('on:click:cell', detail); - }} - {rows} - {headers} /> - {/if} -
diff --git a/src/components/DataTable/DataTable.stories.js b/src/components/DataTable/DataTable.stories.js deleted file mode 100644 index dbf2de70..00000000 --- a/src/components/DataTable/DataTable.stories.js +++ /dev/null @@ -1,35 +0,0 @@ -import { withKnobs, boolean, select, text } from '@storybook/addon-knobs'; -import Component from './DataTable.Story.svelte'; - -export default { title: 'DataTable', decorators: [withKnobs] }; - -export const Default = () => ({ - Component, - props: { - title: text('Optional DataTable title (title)', ''), - description: text('Optional DataTable description (description)', ''), - zebra: boolean('Zebra row styles (zebra)', false), - size: select( - 'Row height (size)', - { compact: 'compact', short: 'short', tall: 'tall', none: null }, - null - ), - stickyHeader: boolean('Sticky header (experimental)', false) - } -}); - -export const Sortable = () => ({ - Component, - props: { - story: 'sortable', - title: text('Optional DataTable title (title)', ''), - description: text('Optional DataTable description (description)', ''), - zebra: boolean('Zebra row styles (zebra)', false), - size: select( - 'Row height (size)', - { compact: 'compact', short: 'short', tall: 'tall', none: null }, - null - ), - stickyHeader: boolean('Sticky header (experimental)', false) - } -}); diff --git a/src/components/DataTable/DataTable.svelte b/src/components/DataTable/DataTable.svelte deleted file mode 100644 index fe8cda3d..00000000 --- a/src/components/DataTable/DataTable.svelte +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - {#each headers as header, i (header.key)} - { - dispatch('click', { header }); - dispatch('click:header', header); - let active = header.key === $sortHeader.key; - let currentSortDirection = active ? $sortHeader.sortDirection : 'none'; - let sortDirection = sortDirectionMap[currentSortDirection]; - sortHeader.set({ - id: sortDirection === 'none' ? null : $thKeys[header.key], - key: header.key, - sortDirection - }); - }}> - {header.value} - - {/each} - - - - {#each sorting ? sortedRows : rows as row, i (row.id)} - { - dispatch('click', { row }); - dispatch('click:row', row); - }}> - {#each row.cells as cell, j (cell.key)} - { - dispatch('click', { row, cell }); - dispatch('click:cell', cell); - }}> - {cell.value} - - {/each} - - {/each} - -
-
-
diff --git a/src/components/DataTable/Table.svelte b/src/components/DataTable/Table.svelte deleted file mode 100644 index 910aaa86..00000000 --- a/src/components/DataTable/Table.svelte +++ /dev/null @@ -1,28 +0,0 @@ - - -{#if stickyHeader} -
- - -
-
-{:else} - - -
-{/if} diff --git a/src/components/DataTable/TableBody.svelte b/src/components/DataTable/TableBody.svelte deleted file mode 100644 index fcb38748..00000000 --- a/src/components/DataTable/TableBody.svelte +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/src/components/DataTable/TableCell.svelte b/src/components/DataTable/TableCell.svelte deleted file mode 100644 index 1d3e93cd..00000000 --- a/src/components/DataTable/TableCell.svelte +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/src/components/DataTable/TableContainer.svelte b/src/components/DataTable/TableContainer.svelte deleted file mode 100644 index 5d5adc3d..00000000 --- a/src/components/DataTable/TableContainer.svelte +++ /dev/null @@ -1,22 +0,0 @@ - - -
- {#if title} -
-

{title}

-

{description}

-
- {/if} - -
diff --git a/src/components/DataTable/TableHead.svelte b/src/components/DataTable/TableHead.svelte deleted file mode 100644 index 522cd18b..00000000 --- a/src/components/DataTable/TableHead.svelte +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/src/components/DataTable/TableHeader.svelte b/src/components/DataTable/TableHeader.svelte deleted file mode 100644 index b73fd21f..00000000 --- a/src/components/DataTable/TableHeader.svelte +++ /dev/null @@ -1,47 +0,0 @@ - - -{#if $tableSortable} - - - -{:else} - - - - - -{/if} diff --git a/src/components/DataTable/index.js b/src/components/DataTable/index.js deleted file mode 100644 index 8ba91f9b..00000000 --- a/src/components/DataTable/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import DataTable from './DataTable.svelte'; - -export default DataTable; diff --git a/src/components/Dropdown/Dropdown.Skeleton.svelte b/src/components/Dropdown/Dropdown.Skeleton.svelte deleted file mode 100644 index d6381922..00000000 --- a/src/components/Dropdown/Dropdown.Skeleton.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
-
- -
-
diff --git a/src/components/Dropdown/Dropdown.Story.svelte b/src/components/Dropdown/Dropdown.Story.svelte deleted file mode 100644 index 7ff22997..00000000 --- a/src/components/Dropdown/Dropdown.Story.svelte +++ /dev/null @@ -1,49 +0,0 @@ - - - - - {#if story === 'skeleton'} -
- -   - -
- {:else} -

Currently, this component does not support items as slots.

-

- items - must be an array of objects; mandatory fields are `id` and `text`. -

-
-      {'items = Array<{ id: string; text: string; }>'}
-    
-
- -
-
- -
- {/if} -
diff --git a/src/components/Dropdown/Dropdown.stories.js b/src/components/Dropdown/Dropdown.stories.js deleted file mode 100644 index 0fe46fd6..00000000 --- a/src/components/Dropdown/Dropdown.stories.js +++ /dev/null @@ -1,34 +0,0 @@ -import { withKnobs, select, text, boolean } from '@storybook/addon-knobs'; -import Component from './Dropdown.Story.svelte'; - -export default { title: 'Dropdown', decorators: [withKnobs] }; - -const types = { - 'Default (default)': 'default', - 'Inline (inline)': 'inline' -}; - -const sizes = { - 'Extra large size (xl)': 'xl', - 'Regular size (lg)': '', - 'Small size (sm)': 'sm' -}; - -export const Default = () => ({ - Component, - props: { - id: text('Dropdown ID (id)', 'carbon-dropdown-example'), - type: select('Dropdown type (type)', types, 'default'), - size: select('Field size (size)', sizes, '') || undefined, - label: text('Label (label)', 'Dropdown menu options'), - 'aria-label': text('Aria Label (aria-label)', 'Dropdown'), - disabled: boolean('Disabled (disabled)', false), - light: boolean('Light variant (light)', false), - titleText: text('Title (titleText)', 'This is not a dropdown title.'), - helperText: text('Helper text (helperText)', 'This is not some helper text.'), - invalid: boolean('Show form validation UI (invalid)', false), - invalidText: text('Form validation UI content (invalidText)', 'A valid value is required') - } -}); - -export const Skeleton = () => ({ Component, props: { story: 'skeleton' } }); diff --git a/src/components/Dropdown/Dropdown.svelte b/src/components/Dropdown/Dropdown.svelte deleted file mode 100644 index 53ecb4fa..00000000 --- a/src/components/Dropdown/Dropdown.svelte +++ /dev/null @@ -1,144 +0,0 @@ - - - { - if (open && fieldRef && !fieldRef.contains(target)) { - open = false; - } - }} /> - -
- {#if titleText} - - {/if} - {#if !inline && helperText} -
- {helperText} -
- {/if} - { - open = fieldRef.contains(target) ? !open : false; - }} - {disabled} - {open} - {invalid} - {invalidText} - {light}> - {#if invalid} - - {/if} - { - if (key === 'Enter') { - open = !open; - if (highlightedIndex > -1 && highlightedIndex !== selectedIndex) { - selectedIndex = highlightedIndex; - open = false; - } - } else if (key === 'Tab') { - open = false; - fieldRef.blur(); - } else if (key === 'ArrowDown') { - change(1); - } else if (key === 'ArrowUp') { - change(-1); - } - }} - on:blur={({ relatedTarget }) => { - if (relatedTarget) { - fieldRef.focus(); - } - }} - {disabled} - {translateWithId} - {id}> - - {#if selectedItem}{itemToString(selectedItem)}{:else}{label}{/if} - - - - {#if open} - - {#each items as item, i (item.id || i)} - { - selectedId = item.id; - selectedIndex = i; - }} - on:mouseenter={() => { - highlightedIndex = i; - }}> - {itemToString(item)} - - {/each} - - {/if} - -
diff --git a/src/components/Dropdown/index.js b/src/components/Dropdown/index.js deleted file mode 100644 index b6df05fe..00000000 --- a/src/components/Dropdown/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import Dropdown from './Dropdown.svelte'; - -export default Dropdown; -export { default as DropdownSkeleton } from './Dropdown.Skeleton.svelte'; diff --git a/src/components/MultiSelect/MultiSelect.Story.svelte b/src/components/MultiSelect/MultiSelect.Story.svelte deleted file mode 100644 index d8e42196..00000000 --- a/src/components/MultiSelect/MultiSelect.Story.svelte +++ /dev/null @@ -1,41 +0,0 @@ - - - -
- -
-
- -
-
diff --git a/src/components/MultiSelect/MultiSelect.stories.js b/src/components/MultiSelect/MultiSelect.stories.js deleted file mode 100644 index 52982d72..00000000 --- a/src/components/MultiSelect/MultiSelect.stories.js +++ /dev/null @@ -1,38 +0,0 @@ -import { withKnobs, select, boolean, text } from '@storybook/addon-knobs'; -import Component from './MultiSelect.Story.svelte'; - -export default { title: 'MultiSelect', decorators: [withKnobs] }; - -const types = { - 'Default (default)': 'default', - 'Inline (inline)': 'inline' -}; - -const sizes = { - 'Extra large size (xl)': 'xl', - 'Regular size (lg)': '', - 'Small size (sm)': 'sm' -}; - -export const Default = () => ({ - Component, - props: { - id: 'multiselect', - titleText: text('Title (titleText)', 'Multiselect Title'), - helperText: text('Helper text (helperText)', 'This is not helper text'), - filterable: boolean('Filterable (filterable)', false), - selectionFeedback: select( - 'Selection feedback (selectionFeedback)', - ['top', 'fixed', 'top-after-reopen'], - 'top-after-reopen' - ), - disabled: boolean('Disabled (disabled)', false), - light: boolean('Light variant (light)', false), - useTitleInItem: boolean('Show tooltip on hover', false), - type: select('UI type (Only for ``) (type)', types, 'default'), - size: select('Field size (size)', sizes, '') || undefined, - label: text('Label (label)', 'MultiSelect Label'), - invalid: boolean('Show form validation UI (invalid)', false), - invalidText: text('Form validation UI content (invalidText)', 'Invalid Selection') - } -}); diff --git a/src/components/MultiSelect/MultiSelect.svelte b/src/components/MultiSelect/MultiSelect.svelte deleted file mode 100644 index 6b825d8b..00000000 --- a/src/components/MultiSelect/MultiSelect.svelte +++ /dev/null @@ -1,295 +0,0 @@ - - - { - if (open && multiSelectRef && !multiSelectRef.contains(target)) { - open = false; - } - }} /> - -
- {#if titleText} - - {/if} - {#if !inline && helperText} -
- {helperText} -
- {/if} - 0 && '--multi-select--selected')} - {id} - {disabled} - {invalid} - {invalidText} - {open} - {light} - {size}> - {#if invalid} - - {/if} - { - if (filterable) { - open = true; - inputRef.focus(); - } else { - open = !open; - } - }} - on:keydown={({ key }) => { - if (filterable) { - return; - } - if (key === ' ') { - open = !open; - } else if (key === 'Tab') { - if (selectionRef && checked.length > 0) { - selectionRef.focus(); - } else { - open = false; - fieldRef.blur(); - } - } else if (key === 'ArrowDown') { - change(1); - } else if (key === 'ArrowUp') { - change(-1); - } else if (key === 'Enter') { - if (highlightedIndex > -1) { - sortedItems[highlightedIndex].checked = !sortedItems[highlightedIndex].checked; - } - } - }} - on:blur={({ relatedTarget }) => { - if (relatedTarget && relatedTarget.getAttribute('role') !== 'button') { - fieldRef.focus(); - } - }} - {id} - {disabled} - {translateWithId}> - {#if checked.length > 0} - { - sortedItems = sortedItems.map(item => ({ ...item, checked: false })); - fieldRef.blur(); - }} - {translateWithId} - {disabled} /> - {/if} - {#if filterable} - { - inputValue = target.value; - }} - on:keydown - on:keydown|stopPropagation={({ key }) => { - if (key === 'Enter') { - if (highlightedIndex > -1) { - sortedItems[highlightedIndex].checked = !sortedItems[highlightedIndex].checked; - } - } else if (key === 'Tab') { - open = false; - } else if (key === 'ArrowDown') { - change(1); - } else if (key === 'ArrowUp') { - change(-1); - } - }} - on:focus - on:blur - on:blur={({ relatedTarget }) => { - if (relatedTarget && relatedTarget.getAttribute('role') !== 'button') { - inputRef.focus(); - } - }} - {disabled} - {placeholder} - {id} - value={inputValue} /> - {#if invalid} - - {/if} - {#if inputValue} - { - inputValue = ''; - open = false; - }} - {translateWithId} - {disabled} - {open} /> - {/if} - { - open = !open; - }} - {translateWithId} - {open} /> - {/if} - {#if !filterable} - {label} - - {/if} - - {#if open} - - {#each filterable ? filteredItems : sortedItems as item, i (item.id || i)} - { - sortedItems = sortedItems.map(_ => - _.id === item.id ? { ..._, checked: !_.checked } : _ - ); - fieldRef.focus(); - }} - on:mouseenter={() => { - highlightedIndex = i; - }}> - - - {/each} - - {/if} - -
diff --git a/src/components/MultiSelect/index.js b/src/components/MultiSelect/index.js deleted file mode 100644 index 5164a2b4..00000000 --- a/src/components/MultiSelect/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import MultiSelect from './MultiSelect.svelte'; - -export default MultiSelect; diff --git a/yarn.lock b/yarn.lock index 23319968..451ff4c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2210,6 +2210,7 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== +<<<<<<< HEAD <<<<<<< HEAD "@types/node@*": version "13.1.6" @@ -2221,6 +2222,8 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.24.tgz#d4606afd8cf6c609036b854360367d1b2c78931f" integrity sha512-1Ciqv9pqwVtW6FsIUKSZNB82E5Cu1I2bBTj1xuIHXLe/1zYLl3956Nbhg2MzSYHVfl9/rmanjbQIb7LibfCnug== ======= +======= +>>>>>>> upstream/master "@types/node@*", "@types/node@^12.0.2": version "12.12.17" resolved "https://registry.npmjs.org/@types/node/-/node-12.12.17.tgz#191b71e7f4c325ee0fb23bc4a996477d92b8c39b" @@ -3769,11 +3772,17 @@ carbon-components@10.9.0: lodash.debounce "^4.0.8" warning "^3.0.0" +<<<<<<< HEAD <<<<<<< HEAD carbon-icons-svelte@^10.8.1: version "10.8.2" resolved "https://registry.yarnpkg.com/carbon-icons-svelte/-/carbon-icons-svelte-10.8.2.tgz#b1432c8de8a19210f50b42e1498b08d01c25b86b" ======= +carbon-icons-svelte@^10.8.2: + version "10.8.2" + resolved "https://registry.npmjs.org/carbon-icons-svelte/-/carbon-icons-svelte-10.8.2.tgz#b1432c8de8a19210f50b42e1498b08d01c25b86b" +>>>>>>> upstream/master +======= carbon-icons-svelte@^10.8.2: version "10.8.2" resolved "https://registry.npmjs.org/carbon-icons-svelte/-/carbon-icons-svelte-10.8.2.tgz#b1432c8de8a19210f50b42e1498b08d01c25b86b" @@ -10767,6 +10776,9 @@ rollup@^1.27.13: version "1.27.14" resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.27.14.tgz#940718d5eec1a6887e399aa0089944bae5c4f377" integrity sha512-DuDjEyn8Y79ALYXMt+nH/EI58L5pEw5HU9K38xXdRnxQhvzUTI/nxAawhkAHUQeudANQ//8iyrhVRHJBuR6DSQ== +<<<<<<< HEAD +>>>>>>> upstream/master +======= >>>>>>> upstream/master dependencies: "@types/estree" "*" @@ -11628,6 +11640,9 @@ svelte-loader@^2.13.6: svelte@^3.16.7: ======= svelte@^3.16.4: +<<<<<<< HEAD +>>>>>>> upstream/master +======= >>>>>>> upstream/master version "3.16.7" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.16.7.tgz#9ade80a4bbbac95595c676dd817222f632fa2c07"