@dreamworld/dw-checkbox 2.2.0-upgrade-version.1 → 2.2.1-development.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.circleci/config.yml +49 -3
- package/dw-checkbox.js +15 -1
- package/package.json +3 -3
package/.circleci/config.yml
CHANGED
|
@@ -1,8 +1,45 @@
|
|
|
1
1
|
version: 2
|
|
2
2
|
jobs:
|
|
3
|
+
merge-to-development:
|
|
4
|
+
machine: true
|
|
5
|
+
steps:
|
|
6
|
+
- run:
|
|
7
|
+
name: Clone Repository
|
|
8
|
+
working_directory: ~/workdir
|
|
9
|
+
command: |
|
|
10
|
+
echo "PR IS::"
|
|
11
|
+
echo $CIRCLE_PULL_REQUEST
|
|
12
|
+
if [[ -n ${CIRCLE_PULL_REQUEST} ]]
|
|
13
|
+
then
|
|
14
|
+
git clone https://${GH_TOKEN}@github.com/DreamworldSolutions/$CIRCLE_PROJECT_REPONAME.git my-repo
|
|
15
|
+
else
|
|
16
|
+
echo "No PR Attached, so not doing anything"
|
|
17
|
+
fi
|
|
18
|
+
- run:
|
|
19
|
+
name: Merge PR branch to development
|
|
20
|
+
working_directory: ~/workdir/my-repo
|
|
21
|
+
command: |
|
|
22
|
+
if [[ -n ${CIRCLE_PULL_REQUEST} ]]
|
|
23
|
+
then
|
|
24
|
+
# circleci has 2.14.x as of now!
|
|
25
|
+
git --version
|
|
26
|
+
git config credential.helper 'cache --timeout=120'
|
|
27
|
+
git config user.email "dw-devops@dreamworld.solutions"
|
|
28
|
+
git config user.name "DW Devops"
|
|
29
|
+
git remote set-url --push origin https://${GH_TOKEN}@github.com/DreamworldSolutions/$CIRCLE_PROJECT_REPONAME.git
|
|
30
|
+
(git checkout -b feature/development origin/master || true)
|
|
31
|
+
(git pull origin feature/development || true)
|
|
32
|
+
git merge origin/$CIRCLE_BRANCH --no-ff --no-edit
|
|
33
|
+
git push origin feature/development
|
|
34
|
+
# Push quietly to prevent showing the token in log
|
|
35
|
+
git push -q origin feature/development
|
|
36
|
+
else
|
|
37
|
+
echo "No PR Attached, so not doing anything."
|
|
38
|
+
fi
|
|
39
|
+
|
|
3
40
|
release-snapshot:
|
|
4
41
|
docker:
|
|
5
|
-
- image: circleci/node:
|
|
42
|
+
- image: circleci/node:14
|
|
6
43
|
steps:
|
|
7
44
|
- checkout
|
|
8
45
|
- run: yarn install --production=true --flat --non-ineractive
|
|
@@ -15,7 +52,7 @@ jobs:
|
|
|
15
52
|
npx semantic-release
|
|
16
53
|
release:
|
|
17
54
|
docker:
|
|
18
|
-
- image: circleci/node:
|
|
55
|
+
- image: circleci/node:14
|
|
19
56
|
steps:
|
|
20
57
|
- checkout
|
|
21
58
|
- run: yarn install --production=true --flat --non-ineractive
|
|
@@ -28,6 +65,15 @@ jobs:
|
|
|
28
65
|
|
|
29
66
|
workflows:
|
|
30
67
|
version: 2
|
|
68
|
+
merge-to-development:
|
|
69
|
+
jobs:
|
|
70
|
+
- merge-to-development:
|
|
71
|
+
context: Dreamworld
|
|
72
|
+
filters:
|
|
73
|
+
branches:
|
|
74
|
+
ignore:
|
|
75
|
+
- master
|
|
76
|
+
- feature/development
|
|
31
77
|
release:
|
|
32
78
|
jobs:
|
|
33
79
|
- release-snapshot:
|
|
@@ -35,7 +81,7 @@ workflows:
|
|
|
35
81
|
filters:
|
|
36
82
|
branches:
|
|
37
83
|
only:
|
|
38
|
-
-
|
|
84
|
+
- feature/development
|
|
39
85
|
- release:
|
|
40
86
|
context: Dreamworld
|
|
41
87
|
filters:
|
package/dw-checkbox.js
CHANGED
|
@@ -21,6 +21,9 @@ export class DwCheckbox extends DwFormElement(LitElement) {
|
|
|
21
21
|
:host {
|
|
22
22
|
display: block;
|
|
23
23
|
outline:none;
|
|
24
|
+
|
|
25
|
+
--mdc-checkbox-unchecked-color: var(--mdc-theme-text-secondary-on-background);
|
|
26
|
+
--mdc-checkbox-disabled-color: var(--mdc-theme-text-disabled-on-background);
|
|
24
27
|
}
|
|
25
28
|
|
|
26
29
|
:host[hidden] {
|
|
@@ -78,7 +81,13 @@ export class DwCheckbox extends DwFormElement(LitElement) {
|
|
|
78
81
|
/**
|
|
79
82
|
* Set to true to set the partial selection of checkbox
|
|
80
83
|
*/
|
|
81
|
-
indeterminate: { type: Boolean}
|
|
84
|
+
indeterminate: { type: Boolean},
|
|
85
|
+
|
|
86
|
+
/**
|
|
87
|
+
* Input property
|
|
88
|
+
* When true, the checkbox remove padding for touchscreens and increase density.
|
|
89
|
+
*/
|
|
90
|
+
reducedTouchTarget: { type: Boolean }
|
|
82
91
|
};
|
|
83
92
|
}
|
|
84
93
|
|
|
@@ -90,10 +99,15 @@ export class DwCheckbox extends DwFormElement(LitElement) {
|
|
|
90
99
|
?disabled="${this.disabled}"
|
|
91
100
|
?checked="${this.checked}"
|
|
92
101
|
?indeterminate="${this.indeterminate}"
|
|
102
|
+
?reducedTouchTarget="${this.reducedTouchTarget}"
|
|
93
103
|
@change="${this._onChange}"
|
|
94
104
|
@click="${(e) => { setTimeout(() => { e.target.blur(); }, 1)}}">
|
|
95
105
|
</mwc-checkbox>
|
|
96
106
|
|
|
107
|
+
<div slot="label">
|
|
108
|
+
<slot name="label"></slot>
|
|
109
|
+
</div>
|
|
110
|
+
|
|
97
111
|
</dw-form-field>
|
|
98
112
|
`;
|
|
99
113
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dreamworld/dw-checkbox",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.1-development.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dw-checkbox.js",
|
|
6
6
|
"scripts": {
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
},
|
|
22
22
|
"homepage": "https://github.com/DreamworldSolutions/dw-checkbox#readme",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@dreamworld/dw-form": "^
|
|
25
|
-
"@dreamworld/pwa-helpers": "^1.
|
|
24
|
+
"@dreamworld/dw-form": "^3.0.1-development.2",
|
|
25
|
+
"@dreamworld/pwa-helpers": "^1.10.0",
|
|
26
26
|
"@material/mwc-checkbox": "^0.20.0",
|
|
27
27
|
"lit-element": "^2.2.1"
|
|
28
28
|
},
|