Skip to content

Commit d68d966

Browse files
Merge pull request #52 from HulkApps/changelog
New Components & Improvements
2 parents e1869c5 + af02b04 commit d68d966

33 files changed

+1454
-23130
lines changed

.storybook/preview.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@ import '!style-loader!css-loader!sass-loader!../src/scss/main.scss';
22
import '!style-loader!css-loader!sass-loader!./styles/docs.scss';
33
import Vue from 'vue';
44
import VueRouter from 'vue-router';
5+
import PToast from '../src/components/PToast/index';
56

67
Vue.use(VueRouter);
78
Vue.component('router-link', Vue.component('RouterLink'));
89

10+
Vue.use(PToast);
11+
912
export const decorators = [(story) => ({
1013
components: {story},
1114
template: '<story />',
1215
router: new VueRouter()
1316
})];
1417

1518
export const parameters = {
16-
actions: { argTypesRegex: "^on[A-Z].*" },
19+
actions: { disable: true },
1720
controls: {
1821
matchers: {
1922
color: /(background|color|backgroundColor)$/i,
@@ -26,6 +29,7 @@ export const parameters = {
2629
method: "alphabetical",
2730
order: [
2831
"Introduction",
32+
"Changelog",
2933
"Actions",
3034
"Structure",
3135
"Forms",

package-lock.json

Lines changed: 0 additions & 22409 deletions
This file was deleted.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"change-case": "^4.1.1",
3939
"core-js": "^3.3.2",
4040
"dayjs": "^1.10.4",
41+
"mitt": "^3.0.0",
4142
"v-click-outside": "^3.0.1",
4243
"vue": "^2.6.10",
4344
"vue-apexcharts": "^1.6.1",
@@ -46,6 +47,7 @@
4647
"vue-multiselect": "^2.1.6",
4748
"vue-property-decorator": "^8.3.0",
4849
"vue-router": "^3.5.1",
50+
"vue-toast-notification": "^0.6.2",
4951
"vue2-daterange-picker": "^0.6.5"
5052
},
5153
"files": [

src/ComponentHelpers.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ class ComponentHelpers {
2323

2424

2525
makeComponentClass(componentName, properties, state) {
26-
var classes = {};
26+
let classes = {};
2727
classes[componentName] = true;
2828

29-
for (var prop of properties) {
30-
var value = state[prop];
31-
var valueTag = '';
29+
for (let prop of properties) {
30+
let value = state[prop];
31+
let valueTag = '';
3232
if (value && typeof value === 'string') {
3333
valueTag = value.charAt(0).toUpperCase() + value.slice(1);
3434
}
@@ -43,10 +43,10 @@ class ComponentHelpers {
4343
return false;
4444
}
4545

46-
var nodeComponentTagName = node.componentOptions.tag;
47-
var componentTagName = this.getComponentName(component.polarisName);
46+
let nodeComponentTagName = node.componentOptions.tag;
47+
let componentTagName = this.getComponentName(component.name);
4848

49-
return nodeComponentTagName == componentTagName;
49+
return nodeComponentTagName === componentTagName;
5050
}
5151

5252
getComponentName(polarisName) {
@@ -66,7 +66,7 @@ class ComponentHelpers {
6666
}
6767

6868
wrapNodesWithComponent(createElement, nodes, component, ignoredComponents = []) {
69-
var children = [];
69+
let children = [];
7070
for (let node of nodes) {
7171
if (!node.tag && !node.text.trim()) {
7272
continue;
Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,35 @@
11
<script lang="tsx">
2-
import { Component, Vue, Prop } from 'vue-property-decorator';
3-
import {PFormLayoutItem} from '@/components/PFormLayout/index';
2+
import {Component, Vue, Prop} from 'vue-property-decorator';
3+
import {PFormLayoutItem, PFormLayoutGroup} from '@/components/PFormLayout/index';
44
import ComponentHelpers from '../../ComponentHelpers';
55
66
@Component({
77
8-
components: {
9-
PFormLayoutItem,
10-
},
8+
components: {
9+
PFormLayoutItem,
10+
PFormLayoutGroup,
11+
},
1112
})
1213
export default class PFormLayout extends Vue {
1314
14-
/**
15-
* Id for the element
16-
*/
17-
@Prop({type: String, default: 'PFormLayout'}) public id!: string;
15+
/**
16+
* Id for the element
17+
*/
18+
@Prop({type: String, default: 'PFormLayout'}) public id!: string;
1819
19-
public render(createElement: any) {
20-
return createElement('div', {
20+
public render(createElement: any) {
21+
return createElement('div', {
2122
class: 'Polaris-FormLayout',
2223
attrs: {
2324
id: this.id,
2425
},
2526
},
26-
ComponentHelpers.wrapNodesWithComponent(createElement,
27-
this.$slots.default, PFormLayoutItem),
28-
);
29-
}
27+
ComponentHelpers.wrapNodesWithComponent(
28+
createElement,
29+
this.$slots.default,
30+
PFormLayoutItem,
31+
[PFormLayoutGroup]),
32+
);
33+
}
3034
}
3135
</script>

src/components/PIcon/PIcon.mdx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { Meta, Story, Preview, Props } from '@storybook/addon-docs/blocks';
1+
<!--- PIcon.stories.mdx -->
2+
3+
import { Meta, Story, Preview, Props, ArgsTable } from '@storybook/addon-docs';
24
import PIcon from './PIcon.vue';
3-
import { ArgsTable } from '@storybook/addon-docs';
45

5-
<Meta title="MDX|Icon" component={PIcon} />
6+
<Meta title="MDX/Icon" component={PIcon} />
67

78
# Icon
89

@@ -11,4 +12,4 @@ import { ArgsTable } from '@storybook/addon-docs';
1112

1213
```
1314

14-
<Props of={PIcon} />
15+
<ArgsTable />

src/components/PIcon/PIcon.stories.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import PIcon from './PIcon';
22
import ShopifyIcons from './ShopifyIcons';
3-
import IconMDX from './PIcon.mdx';
3+
import PIconMDX from './PIcon.mdx';
44

55
export default {
66
title: 'Images & Icons / Icon',
@@ -10,13 +10,13 @@ export default {
1010
showPanel: false,
1111
},
1212
controls: {
13-
disabled: true,
13+
disable: true,
1414
},
1515
actions: {
16-
disabled: true,
16+
disable: true,
1717
},
1818
docs: {
19-
page: IconMDX,
19+
page: PIconMDX,
2020
},
2121
},
2222
}

src/components/PIcon/PIcon.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,14 @@ export default class PIcon extends Vue {
7878
7979
/**
8080
* Icon color
81+
* @values true | false
8182
*/
8283
@Prop({type: String, default: null}) public color!: Color;
8384
8485
/**
8586
* Show a backdrop behind the icon
8687
*
87-
* @description true | false
88+
* @values true | false
8889
*/
8990
@Prop({type: Boolean, default: false}) public backdrop!: boolean;
9091

0 commit comments

Comments
 (0)