@dreamworld/dw-checkbox 2.2.0-upgrade-version.2 → 2.2.0

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.
@@ -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:lts
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:lts
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
- - /^feature\/.+$/
84
+ - feature/development
39
85
  - release:
40
86
  context: Dreamworld
41
87
  filters:
package/dw-checkbox.js CHANGED
@@ -78,7 +78,13 @@ export class DwCheckbox extends DwFormElement(LitElement) {
78
78
  /**
79
79
  * Set to true to set the partial selection of checkbox
80
80
  */
81
- indeterminate: { type: Boolean}
81
+ indeterminate: { type: Boolean},
82
+
83
+ /**
84
+ * Input property
85
+ * When true, the checkbox remove padding for touchscreens and increase density.
86
+ */
87
+ reducedTouchTarget: { type: Boolean }
82
88
  };
83
89
  }
84
90
 
@@ -90,6 +96,7 @@ export class DwCheckbox extends DwFormElement(LitElement) {
90
96
  ?disabled="${this.disabled}"
91
97
  ?checked="${this.checked}"
92
98
  ?indeterminate="${this.indeterminate}"
99
+ ?reducedTouchTarget="${this.reducedTouchTarget}"
93
100
  @change="${this._onChange}"
94
101
  @click="${(e) => { setTimeout(() => { e.target.blur(); }, 1)}}">
95
102
  </mwc-checkbox>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dreamworld/dw-checkbox",
3
- "version": "2.2.0-upgrade-version.2",
3
+ "version": "2.2.0",
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": "^2.3.0-development.2",
25
- "@dreamworld/pwa-helpers": "^1.11.1",
24
+ "@dreamworld/dw-form": "1.0.1",
25
+ "@dreamworld/pwa-helpers": "^1.10.0",
26
26
  "@material/mwc-checkbox": "^0.20.0",
27
27
  "lit-element": "^2.2.1"
28
28
  },