Skip to content

Commit 7c16a23

Browse files
committed
Chore: 1.0.6
2 parents fae21ab + f05b3b6 commit 7c16a23

File tree

36 files changed

+415
-199
lines changed

36 files changed

+415
-199
lines changed

.storybook/stories/GetStarted.stories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { Meta } from '@storybook/addon-docs';
2424

2525
Polaris Vue by Ownego is a component library for [Vue 3](https://vuejs.org/) based on [Shopify Polaris style guide](https://polaris.shopify.com/). We try to keep the package light-weight and easy to use (mostly similar with original Polaris Library).
2626

27-
**Follow Polaris React version:** [9.20.0](https://github.com/Shopify/polaris/releases/tag/%40shopify%2Fpolaris%409.20.0) - Migrated date: *Jul 12th, 2022*.
27+
**Follow Polaris React version:** [9.23.1](https://github.com/Shopify/polaris/releases/tag/%40shopify%2Fpolaris%409.23.1) - Migrated date: *Aug 18th, 2022*.
2828

2929
<a href="https://github.com/ownego/polaris-vue"><img src="https://img.shields.io/badge/github-%23121011.svg?style=for-the-badge&logo=github&logoColor=white" alt="Github"/></a>
3030

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Polaris Vue by Ownego only supports **Vue 3.0+**.
55
Polaris Vue based on [Shopify Polaris style guide](https://polaris.shopify.com/), built especially for Vue 3.
66
We're trying to make it mostly close with Shopify style guide and get a better performance.
77

8-
**Follow Polaris React version:** [9.20.0](https://github.com/Shopify/polaris/releases/tag/%40shopify%2Fpolaris%409.20.0) - Migrated date: *Jul 12th, 2022*.
8+
**Follow Polaris React version:** [9.23.1](https://github.com/Shopify/polaris/releases/tag/%40shopify%2Fpolaris%409.23.1) - Migrated date: *Aug 18th, 2022*.
99

1010
<br/>
1111

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@ownego/polaris-vue",
3-
"version": "1.0.5",
4-
"polaris_version": "9.20.0",
3+
"version": "1.0.6",
4+
"polaris_version": "9.23.1",
55
"description": "Shopify Polaris UI library for Vue 3",
66
"author": "Ownego Team",
77
"keywords": [
@@ -35,15 +35,16 @@
3535
"remove-trashes": "rimraf dist/index.html dist/favicon.ico dist/images"
3636
},
3737
"dependencies": {
38-
"@shopify/polaris-icons": "^5.2.0",
38+
"@shopify/polaris-icons": "^5.4.0",
39+
"polaris": "https://github.com/juzser/polaris.git",
3940
"vite-svg-loader": "^3.1.2",
4041
"vue": "^3.2.31",
4142
"vue-router": "^3.1.6"
4243
},
4344
"devDependencies": {
4445
"@babel/core": "^7.17.5",
4546
"@rushstack/eslint-patch": "^1.1.0",
46-
"@shopify/polaris-tokens": "^5.5.0",
47+
"@shopify/polaris-tokens": "^5.5.1",
4748
"@shopify/typescript-configs": "^5.1.0",
4849
"@storybook/addon-a11y": "^6.5.5",
4950
"@storybook/addon-actions": "^6.5.5",
@@ -67,7 +68,6 @@
6768
"fs-extra": "^10.1.0",
6869
"hash-generator": "^0.1.0",
6970
"path": "^0.12.7",
70-
"polaris": "https://github.com/juzser/polaris.git",
7171
"postcss": "^7",
7272
"postcss-modules": "^3",
7373
"prettier": "^2.5.1",

src/classes/DataTable.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"DataTable":"Polaris-DataTable","condensed":"Polaris-DataTable--condensed","Navigation":"Polaris-DataTable__Navigation","IncreasedTableDensity":"Polaris-DataTable__IncreasedTableDensity","Pip":"Polaris-DataTable__Pip","Pip-visible":"Polaris-DataTable__Pip--visible","ScrollContainer":"Polaris-DataTable__ScrollContainer","Table":"Polaris-DataTable__Table","TableRow":"Polaris-DataTable__TableRow","Cell":"Polaris-DataTable__Cell","ZebraStripingOnData":"Polaris-DataTable__ZebraStripingOnData","RowCountIsEven":"Polaris-DataTable__RowCountIsEven","ShowTotalsInFooter":"Polaris-DataTable__ShowTotalsInFooter","Cell-firstColumn":"Polaris-DataTable__Cell--firstColumn","Cell-numeric":"Polaris-DataTable__Cell--numeric","Cell-truncated":"Polaris-DataTable__Cell--truncated","Cell-header":"Polaris-DataTable__Cell--header","Cell-sortable":"Polaris-DataTable__Cell--sortable","Heading-left":"Polaris-DataTable__Heading--left","Cell-verticalAlignTop":"Polaris-DataTable__Cell--verticalAlignTop","Cell-verticalAlignBottom":"Polaris-DataTable__Cell--verticalAlignBottom","Cell-verticalAlignMiddle":"Polaris-DataTable__Cell--verticalAlignMiddle","Cell-verticalAlignBaseline":"Polaris-DataTable__Cell--verticalAlignBaseline","hoverable":"Polaris-DataTable--hoverable","Cell-hovered":"Polaris-DataTable__Cell--hovered","Icon":"Polaris-DataTable__Icon","Heading":"Polaris-DataTable__Heading","StickyHeaderEnabled":"Polaris-DataTable__StickyHeaderEnabled","StickyTable":"Polaris-DataTable__StickyTable","Cell-sorted":"Polaris-DataTable__Cell--sorted","Cell-total":"Polaris-DataTable__Cell--total","ShowTotals":"Polaris-DataTable__ShowTotals","Cell-total-footer":"Polaris-DataTable--cellTotalFooter","Footer":"Polaris-DataTable__Footer","StickyTableHeader":"Polaris-DataTable__StickyTableHeader","StickyTableHeader-isSticky":"Polaris-DataTable__StickyTableHeader--isSticky","StickyTableColumnHeader-isScrolling":"Polaris-DataTable__StickyTableColumnHeader--isScrolling","StickyTableHeadingsRow":"Polaris-DataTable__StickyTableHeadingsRow","FixedFirstColumn":"Polaris-DataTable__FixedFirstColumn","separate":"Polaris-DataTable--separate","TooltipContent":"Polaris-DataTable__TooltipContent"}
1+
{"DataTable":"Polaris-DataTable","condensed":"Polaris-DataTable--condensed","Navigation":"Polaris-DataTable__Navigation","IncreasedTableDensity":"Polaris-DataTable__IncreasedTableDensity","Pip":"Polaris-DataTable__Pip","Pip-visible":"Polaris-DataTable__Pip--visible","ScrollContainer":"Polaris-DataTable__ScrollContainer","Table":"Polaris-DataTable__Table","TableRow":"Polaris-DataTable__TableRow","Cell":"Polaris-DataTable__Cell","ZebraStripingOnData":"Polaris-DataTable__ZebraStripingOnData","RowCountIsEven":"Polaris-DataTable__RowCountIsEven","ShowTotalsInFooter":"Polaris-DataTable__ShowTotalsInFooter","Cell-firstColumn":"Polaris-DataTable__Cell--firstColumn","Cell-numeric":"Polaris-DataTable__Cell--numeric","Cell-truncated":"Polaris-DataTable__Cell--truncated","Cell-header":"Polaris-DataTable__Cell--header","Cell-sortable":"Polaris-DataTable__Cell--sortable","Heading-left":"Polaris-DataTable__Heading--left","Cell-verticalAlignTop":"Polaris-DataTable__Cell--verticalAlignTop","Cell-verticalAlignBottom":"Polaris-DataTable__Cell--verticalAlignBottom","Cell-verticalAlignMiddle":"Polaris-DataTable__Cell--verticalAlignMiddle","Cell-verticalAlignBaseline":"Polaris-DataTable__Cell--verticalAlignBaseline","hoverable":"Polaris-DataTable--hoverable","Cell-hovered":"Polaris-DataTable__Cell--hovered","Icon":"Polaris-DataTable__Icon","Heading":"Polaris-DataTable__Heading","StickyHeaderEnabled":"Polaris-DataTable__StickyHeaderEnabled","StickyHeaderWrapper":"Polaris-DataTable__StickyHeaderWrapper","Cell-sorted":"Polaris-DataTable__Cell--sorted","Cell-total":"Polaris-DataTable__Cell--total","ShowTotals":"Polaris-DataTable__ShowTotals","Cell-total-footer":"Polaris-DataTable--cellTotalFooter","Footer":"Polaris-DataTable__Footer","StickyHeaderInner":"Polaris-DataTable__StickyHeaderInner","StickyHeaderInner-isSticky":"Polaris-DataTable__StickyHeaderInner--isSticky","StickyHeaderTable":"Polaris-DataTable__StickyHeaderTable","StickyTableColumnHeader-isScrolling":"Polaris-DataTable__StickyTableColumnHeader--isScrolling","StickyTableHeadingsRow":"Polaris-DataTable__StickyTableHeadingsRow","FixedFirstColumn":"Polaris-DataTable__FixedFirstColumn","separate":"Polaris-DataTable--separate","TooltipContent":"Polaris-DataTable__TooltipContent"}

src/classes/IndexTable.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"IndexTable":"Polaris-IndexTable","LoadingContainer-enter":"Polaris-IndexTable__LoadingContainer--enter","LoadingContainer-enter-active":"Polaris-IndexTable--loadingContainerEnterActive","LoadingContainer-exit":"Polaris-IndexTable__LoadingContainer--exit","LoadingContainer-exit-active":"Polaris-IndexTable--loadingContainerExitActive","LoadingPanel":"Polaris-IndexTable__LoadingPanel","LoadingPanelRow":"Polaris-IndexTable__LoadingPanelRow","LoadingPanelText":"Polaris-IndexTable__LoadingPanelText","Table":"Polaris-IndexTable__Table","Table-scrolling":"Polaris-IndexTable__Table--scrolling","TableCell-first":"Polaris-IndexTable__TableCell--first","TableCell":"Polaris-IndexTable__TableCell","TableHeading-first":"Polaris-IndexTable__TableHeading--first","TableHeading-second":"Polaris-IndexTable__TableHeading--second","Table-unselectable":"Polaris-IndexTable__Table--unselectable","TableRow":"Polaris-IndexTable__TableRow","TableRow-unclickable":"Polaris-IndexTable__TableRow--unclickable","statusSuccess":"Polaris-IndexTable--statusSuccess","statusSubdued":"Polaris-IndexTable--statusSubdued","TableRow-hovered":"Polaris-IndexTable__TableRow--hovered","TableRow-selected":"Polaris-IndexTable__TableRow--selected","TableRow-subdued":"Polaris-IndexTable__TableRow--subdued","TableHeading":"Polaris-IndexTable__TableHeading","TableHeading-flush":"Polaris-IndexTable__TableHeading--flush","ColumnHeaderCheckboxWrapper":"Polaris-IndexTable__ColumnHeaderCheckboxWrapper","FirstStickyHeaderElement":"Polaris-IndexTable__FirstStickyHeaderElement","TableHeading-unselectable":"Polaris-IndexTable__TableHeading--unselectable","TableCell-flush":"Polaris-IndexTable__TableCell--flush","Table-sticky-scrolling":"Polaris-IndexTable--tableStickyScrolling","TableHeading-last":"Polaris-IndexTable__TableHeading--last","Table-sticky-last":"Polaris-IndexTable--tableStickyLast","StickyTable":"Polaris-IndexTable__StickyTable","StickyTableHeader":"Polaris-IndexTable__StickyTableHeader","StickyTableHeader-isSticky":"Polaris-IndexTable__StickyTableHeader--isSticky","StickyTableColumnHeader":"Polaris-IndexTable__StickyTableColumnHeader","StickyTableColumnHeader-isScrolling":"Polaris-IndexTable__StickyTableColumnHeader--isScrolling","StickyTableHeadings":"Polaris-IndexTable__StickyTableHeadings","StickyTableHeading-second":"Polaris-IndexTable__StickyTableHeading--second","unselectable":"Polaris-IndexTable--unselectable","StickyTableHeading-second-scrolling":"Polaris-IndexTable--stickyTableHeadingSecondScrolling","ScrollLeft":"Polaris-IndexTable__ScrollLeft","ScrollRight":"Polaris-IndexTable__ScrollRight","ScrollRight-onboarding":"Polaris-IndexTable__ScrollRight--onboarding","BulkActionsWrapper":"Polaris-IndexTable__BulkActionsWrapper","ScrollBarContainer":"Polaris-IndexTable__ScrollBarContainer","scrollBarContainerCondensed":"Polaris-IndexTable--scrollBarContainerCondensed","scrollBarContainerHidden":"Polaris-IndexTable--scrollBarContainerHidden","ScrollBar":"Polaris-IndexTable__ScrollBar","disableTextSelection":"Polaris-IndexTable--disableTextSelection","selectMode":"Polaris-IndexTable--selectMode","EmptySearchResultWrapper":"Polaris-IndexTable__EmptySearchResultWrapper","condensedRow":"Polaris-IndexTable--condensedRow","CondensedList":"Polaris-IndexTable__CondensedList","HeaderWrapper":"Polaris-IndexTable__HeaderWrapper","StickyTable-condensed":"Polaris-IndexTable__StickyTable--condensed","StickyTableHeader-condensed":"Polaris-IndexTable__StickyTableHeader--condensed","ScrollBarContent":"Polaris-IndexTable__ScrollBarContent"}
1+
{"IndexTable":"Polaris-IndexTable","LoadingContainer-enter":"Polaris-IndexTable__LoadingContainer--enter","LoadingContainer-enter-active":"Polaris-IndexTable--loadingContainerEnterActive","LoadingContainer-exit":"Polaris-IndexTable__LoadingContainer--exit","LoadingContainer-exit-active":"Polaris-IndexTable--loadingContainerExitActive","LoadingPanel":"Polaris-IndexTable__LoadingPanel","LoadingPanelRow":"Polaris-IndexTable__LoadingPanelRow","LoadingPanelText":"Polaris-IndexTable__LoadingPanelText","Table":"Polaris-IndexTable__Table","Table-scrolling":"Polaris-IndexTable__Table--scrolling","TableCell-first":"Polaris-IndexTable__TableCell--first","TableCell":"Polaris-IndexTable__TableCell","TableHeading-first":"Polaris-IndexTable__TableHeading--first","TableHeading-second":"Polaris-IndexTable__TableHeading--second","Table-unselectable":"Polaris-IndexTable__Table--unselectable","TableRow":"Polaris-IndexTable__TableRow","TableRow-unclickable":"Polaris-IndexTable__TableRow--unclickable","statusSuccess":"Polaris-IndexTable--statusSuccess","statusSubdued":"Polaris-IndexTable--statusSubdued","TableRow-hovered":"Polaris-IndexTable__TableRow--hovered","TableRow-selected":"Polaris-IndexTable__TableRow--selected","TableRow-subdued":"Polaris-IndexTable__TableRow--subdued","TableRow-disabled":"Polaris-IndexTable__TableRow--disabled","TableHeading":"Polaris-IndexTable__TableHeading","TableHeading-flush":"Polaris-IndexTable__TableHeading--flush","ColumnHeaderCheckboxWrapper":"Polaris-IndexTable__ColumnHeaderCheckboxWrapper","FirstStickyHeaderElement":"Polaris-IndexTable__FirstStickyHeaderElement","TableHeading-unselectable":"Polaris-IndexTable__TableHeading--unselectable","TableCell-flush":"Polaris-IndexTable__TableCell--flush","Table-sticky-scrolling":"Polaris-IndexTable--tableStickyScrolling","TableHeading-last":"Polaris-IndexTable__TableHeading--last","Table-sticky-last":"Polaris-IndexTable--tableStickyLast","StickyTable":"Polaris-IndexTable__StickyTable","StickyTableHeader":"Polaris-IndexTable__StickyTableHeader","StickyTableHeader-isSticky":"Polaris-IndexTable__StickyTableHeader--isSticky","StickyTableColumnHeader":"Polaris-IndexTable__StickyTableColumnHeader","StickyTableColumnHeader-isScrolling":"Polaris-IndexTable__StickyTableColumnHeader--isScrolling","StickyTableHeadings":"Polaris-IndexTable__StickyTableHeadings","StickyTableHeading-second":"Polaris-IndexTable__StickyTableHeading--second","unselectable":"Polaris-IndexTable--unselectable","StickyTableHeading-second-scrolling":"Polaris-IndexTable--stickyTableHeadingSecondScrolling","ScrollLeft":"Polaris-IndexTable__ScrollLeft","ScrollRight":"Polaris-IndexTable__ScrollRight","ScrollRight-onboarding":"Polaris-IndexTable__ScrollRight--onboarding","BulkActionsWrapper":"Polaris-IndexTable__BulkActionsWrapper","ScrollBarContainer":"Polaris-IndexTable__ScrollBarContainer","scrollBarContainerCondensed":"Polaris-IndexTable--scrollBarContainerCondensed","scrollBarContainerHidden":"Polaris-IndexTable--scrollBarContainerHidden","ScrollBar":"Polaris-IndexTable__ScrollBar","disableTextSelection":"Polaris-IndexTable--disableTextSelection","selectMode":"Polaris-IndexTable--selectMode","EmptySearchResultWrapper":"Polaris-IndexTable__EmptySearchResultWrapper","condensedRow":"Polaris-IndexTable--condensedRow","CondensedList":"Polaris-IndexTable__CondensedList","HeaderWrapper":"Polaris-IndexTable__HeaderWrapper","StickyTable-condensed":"Polaris-IndexTable__StickyTable--condensed","StickyTableHeader-condensed":"Polaris-IndexTable__StickyTableHeader--condensed","ScrollBarContent":"Polaris-IndexTable__ScrollBarContent"}

src/classes/Link.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"Link":"Polaris-Link","IconLockup":"Polaris-Link__IconLockup","IconLayout":"Polaris-Link__IconLayout","monochrome":"Polaris-Link--monochrome","removeUnderline":"Polaris-Link--removeUnderline"}
1+
{"Link":"Polaris-Link","monochrome":"Polaris-Link--monochrome","removeUnderline":"Polaris-Link--removeUnderline"}

src/classes/TruncatedText.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"Truncate":"Polaris-TruncatedText__Truncate"}

src/components/ActionMenu/components/SecondaryAction/SecondaryAction.vue

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,35 @@ span(
33
:class="className",
44
ref="secondaryActionsRef",
55
)
6-
Button(@click="$emit('click')", v-bind="props")
6+
Tooltip(
7+
v-if="helpText || hasSlot(slots.helpText)",
8+
:content="helpText || ''",
9+
)
10+
template(
11+
v-if="hasSlot(slots.helpText)",
12+
#content,
13+
)
14+
slot(name="helpText")
15+
16+
Button(
17+
v-bind="props",
18+
@click="$emit('click')",
19+
)
20+
slot
21+
Button(
22+
v-else,
23+
v-bind="props",
24+
@click="$emit('click')",
25+
)
726
slot
827
</template>
928

1029
<script setup lang="ts">
11-
import { computed, ref, onMounted } from 'vue';
30+
import { computed, ref, onMounted, useSlots } from 'vue';
1231
import { classNames } from 'polaris/polaris-react/src/utilities/css';
1332
import styles from '@/classes/ActionMenu-SecondaryAction.json';
14-
import { Button } from '@/components';
33+
import { Button, Tooltip } from '@/components';
34+
import { hasSlot } from '@/utilities/has-slot';
1535
import type { IconSource } from '@/utilities/type';
1636
import type { ConnectedDisclosure } from '@/components/Button/utils';
1737
@@ -31,6 +51,7 @@ interface ButtonProps {
3151
ariaDescribedBy?: string;
3252
primary?: boolean;
3353
destructive?: boolean;
54+
helpText?: string;
3455
size?: 'slim' | 'medium' | 'large';
3556
textAlign?: 'left' | 'right' | 'center';
3657
outline?: boolean;
@@ -52,6 +73,8 @@ const emits = defineEmits<{
5273
5374
const secondaryActionsRef = ref<HTMLSpanElement | null>(null);
5475
76+
const slots = useSlots();
77+
5578
const className = computed(() => {
5679
return classNames(
5780
styles.SecondaryAction,

src/components/Banner/Banner.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ div(
6969
UnstyledButton(
7070
v-else,
7171
:class="styles.SecondaryAction",
72-
@click="secondaryAction.onAction",
72+
@click="secondaryAction && secondaryAction.onAction",
7373
)
7474
span(:class="styles.Text") {{ secondaryAction.content }}
7575
</template>

src/components/Button/Button.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ div(
1717
button(
1818
type="button",
1919
:class="connectedDisclosureClassName",
20-
:disabled="connectedDisclosureData.disabled",
20+
:aria-disabled="connectedDisclosureData.disabled",
21+
:tabIndex="connectedDisclosureData.disabled ? -1 : undefined"
2122
:aria-label="connectedDisclosureData.disclosureLabel",
2223
:aria-describedby="ariaDescribedBy",
2324
:aria-checked="ariaChecked",
24-
@click="toggleDisclosureActive",
25+
@click="handleClick",
2526
@mouseup="handleMouseUpByBlurring",
2627
)
2728
span
@@ -57,6 +58,7 @@ import { classNames, variationName } from 'polaris/polaris-react/src/utilities/c
5758
import CaretDownMinor from '@icons/CaretDownMinor.svg';
5859
import { handleMouseUpByBlurring } from '@/utilities/focus';
5960
import { capitalize } from '@/utilities/capitalize';
61+
import { useDisableClick } from '@/utilities/use-disable-interaction';
6062
import type { IconSource } from '@/utilities/type';
6163
import styles from '@/classes/Button.json';
6264
import type { ConnectedDisclosure } from './utils';
@@ -282,6 +284,7 @@ const toggleDisclosureActive = () => {
282284
disclosureActive.value = !disclosureActive.value;
283285
};
284286
287+
const handleClick = useDisableClick(connectedDisclosureData.value.disabled, toggleDisclosureActive);
285288
</script>
286289

287290
<style lang="scss">

0 commit comments

Comments
 (0)