Skip to content

Commit 4cdbf4c

Browse files
jyouncejyounce
committed
chore(merge): continuous
2 parents 719dae1 + 98e12d8 commit 4cdbf4c

File tree

6 files changed

+50
-40
lines changed

6 files changed

+50
-40
lines changed

‎src/client/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
},
3838
"flat": true,
3939
"dependencies": {
40-
"@rapid-build-ui/form-control": "^0.0.7",
41-
"@rapid-build-ui/rb-base": "^0.0.8",
42-
"@rapid-build-ui/rb-popover": "^0.0.15"
40+
"@rapid-build-ui/form-control": "^0.0.8",
41+
"@rapid-build-ui/rb-base": "^0.0.9",
42+
"@rapid-build-ui/rb-popover": "^0.0.16"
4343
}
4444
}

‎src/client/scripts/rb-checkbox.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ export class RbCheckbox extends FormControl(RbBase()) {
1919
}
2020
viewReady() { // :void
2121
super.viewReady && super.viewReady();
22-
Object.assign(this.rb.elms, {
23-
focusElm: this.shadowRoot.querySelector('.sublabel'),
24-
formControl: this.shadowRoot.querySelector('input')
22+
Object.assign(this.rb.formControl, {
23+
elm: this.shadowRoot.querySelector('input'),
24+
focusElm: this.shadowRoot.querySelector('.sublabel'),
2525
});
2626
this._initSlotStates(); // see rb-base: private/mixins/slot.js
2727
}
@@ -109,7 +109,7 @@ export class RbCheckbox extends FormControl(RbBase()) {
109109
evt.preventDefault(); // prevent space key from moving page down
110110
this.setValue(value);
111111
await this.validate()
112-
this.rb.elms.formControl.checked = this.value; // needed for firefox
112+
this.rb.formControl.elm.checked = this.value; // needed for firefox
113113
this._onchange(evt);
114114
}
115115

‎src/client/styles/layout/popover.scss‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
/***************
22
* POPOVER SLOT
33
***************/
4+
::slotted([slot="popover"]) {
5+
--rb-popover-trigger-transition: none; // match label transition
6+
--rb-popover-default-caption-bg: #f7f7f7 !important; // match popover neutral colors
7+
--rb-popover-default-caption-color: #5f6e7e !important;
8+
--rb-popover-default-trigger-color: 'inherit' !important; // match control state color
9+
--rb-popover-default-trigger-color-hover: 'inherit' !important;
10+
--rb-popover-trigger-opacity: .75; // lighten up color
11+
--rb-popover-trigger-opacity-hover: .55;
12+
.active &, .invalid & {
13+
--rb-popover-trigger-opacity: .8;
14+
--rb-popover-trigger-opacity-hover: .6;
15+
}
16+
}
17+
418
.with-label ::slotted([slot="popover"]) {
519
position: relative;
6-
top: .5px;
720
left: -1px;
821
margin-right: 3px;
922
}

‎src/client/styles/style/colors.scss‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,5 @@
2323
.label, .subtext, .sublabel {
2424
color: mapGet($formControlColors, text, invalid, default);
2525
}
26-
::slotted([slot="popover"]) {
27-
--rb-popover-default-trigger-color: mapGet($formControlColors, text, invalid, default);
28-
}
2926
}
3027
}

‎src/client/views/rb-checkbox.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
${props.right ? 'right' : ''}
66
${props.label && 'with-label'}
77
${props.inline ? 'inline' : ''}
8-
${props._valid ? 'valid' : 'invalid'}
8+
${this._valid ? 'valid' : 'invalid'}
99
${props.horizontal ? 'horizontal' : ''}
1010
${state.slots.popover ? 'with-popover' : ''}
1111
">
@@ -39,8 +39,8 @@
3939
@click="${this._onclick.bind(this, props.value)}">
4040
</label>
4141

42-
${props._eMsg || props.subtext
43-
? html`<span class="subtext">${props._eMsg || props.subtext}</span>`
42+
${this._error || props.subtext
43+
? html`<span class="subtext">${this._error || props.subtext}</span>`
4444
: null
4545
}
4646
<div>

‎src/client/yarn.lock‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,43 @@
22
# yarn lockfile v1
33

44

5-
"@rapid-build-ui/form-control@^0.0.7":
6-
version "0.0.7"
7-
resolved "https://registry.yarnpkg.com/@rapid-build-ui/form-control/-/form-control-0.0.7.tgz#bd21d4914184fdad983a7810f90404c1fa454b82"
8-
integrity sha512-/jN8fTgU9kp+6dPMSvvH/XjMcN8erGPlSHoXBiLeQMJyWsQowl5fFp+Q1ams6W99blOtM2pDYXnosJIlys08Gw==
5+
"@rapid-build-ui/form-control@^0.0.8":
6+
version "0.0.8"
7+
resolved "https://registry.yarnpkg.com/@rapid-build-ui/form-control/-/form-control-0.0.8.tgz#5dfb8b165b6b1ad18b7dae62fc2f8f302cbc194c"
8+
integrity sha512-MVqcwYbtAgfgnI2NggjzOhdpmybVoEtBM48+KOIHMZf234hzLTCjctOOG5WlSGrmSS9v9hEaajC2m5RKKN7rsw==
99
dependencies:
10-
"@rapid-build-ui/rb-base" "^0.0.8"
10+
"@rapid-build-ui/rb-base" "^0.0.9"
1111

12-
"@rapid-build-ui/rb-base@^0.0.8":
13-
version "0.0.8"
14-
resolved "https://registry.yarnpkg.com/@rapid-build-ui/rb-base/-/rb-base-0.0.8.tgz#cc6cd36768f3b8297c58656790d642bc19722693"
15-
integrity sha512-v3mlKlgq9Gq67ChotflRDtDUwAQj7SlEUiuLz9MIjBgsW5ZjBVKd9djQau/BGTj2uLH1ppHskfQaIXHodK7tGA==
12+
"@rapid-build-ui/rb-base@^0.0.9":
13+
version "0.0.9"
14+
resolved "https://registry.yarnpkg.com/@rapid-build-ui/rb-base/-/rb-base-0.0.9.tgz#5922cc02a82b3301a7506e2773c717ce75c6e6a0"
15+
integrity sha512-sMJ5opgKAIg88EYkptQ9+V6rFnVih1hhOxNyHIFQAxdqVP+hWMK1hAoimoPpGFqyEjWZy8HTWTDsqLsD5mr83w==
1616
dependencies:
1717
lit-html "^1.0.0"
1818
skatejs "^5.2.4"
1919

20-
"@rapid-build-ui/rb-button@^0.0.15":
21-
version "0.0.15"
22-
resolved "https://registry.yarnpkg.com/@rapid-build-ui/rb-button/-/rb-button-0.0.15.tgz#fa725786dd355809b4ef7677d7aaf1c71efbdbc5"
23-
integrity sha512-7WsfxEsIY14AvjMyr/djvY+qaxnvdNllRdMlTSWWGgI7FnwCjX69k0cz4Rtk1Xnmtvd18IXV6O+2T4eScxBbPA==
20+
"@rapid-build-ui/rb-button@^0.0.16":
21+
version "0.0.16"
22+
resolved "https://registry.yarnpkg.com/@rapid-build-ui/rb-button/-/rb-button-0.0.16.tgz#f3fb3d4d47a477c7a71390dcc5e9dc1c4acde57e"
23+
integrity sha512-OHI3y+TjLkDYGlUujJvmVDv5EzHk5PXJhcMgueaBTU8rI3nx7FjFRg0Xg+YkWjAB8+MqNjYawoiqIVNGE8ggCg==
2424
dependencies:
25-
"@rapid-build-ui/rb-base" "^0.0.8"
26-
"@rapid-build-ui/rb-icon" "^0.0.13"
25+
"@rapid-build-ui/rb-base" "^0.0.9"
26+
"@rapid-build-ui/rb-icon" "^0.0.14"
2727

28-
"@rapid-build-ui/rb-icon@^0.0.13":
29-
version "0.0.13"
30-
resolved "https://registry.yarnpkg.com/@rapid-build-ui/rb-icon/-/rb-icon-0.0.13.tgz#4c327ba8aaa9b69fbe23b346b44ddf1ebda49af4"
31-
integrity sha512-MZW7xoTU1ryQX+bH5dKfvSE1G0hXRGR2RYVWlrBWfVYUKPMERDdZTMUH4WeQcuTAUi/c4hTdjipPju/SyDC8kg==
28+
"@rapid-build-ui/rb-icon@^0.0.14":
29+
version "0.0.14"
30+
resolved "https://registry.yarnpkg.com/@rapid-build-ui/rb-icon/-/rb-icon-0.0.14.tgz#46e162ad753233d6877b28d9e5517337e2211fe6"
31+
integrity sha512-1/nEKB2rPgLp3LDcCuCuYe6uQOoXXYSsPKWlrQ8ynS5gjrY3k5X0HVcebCDyvcGp9imdOYR62dqt3afuzLWl1A==
3232
dependencies:
33-
"@rapid-build-ui/rb-base" "^0.0.8"
33+
"@rapid-build-ui/rb-base" "^0.0.9"
3434

35-
"@rapid-build-ui/rb-popover@^0.0.15":
36-
version "0.0.15"
37-
resolved "https://registry.yarnpkg.com/@rapid-build-ui/rb-popover/-/rb-popover-0.0.15.tgz#bd7bc439247ca8a95f15d1024ad49f3d7a6d9503"
38-
integrity sha512-epu9cMBnXqEvZLuWilf/tLVftLAq70CeY/J0xhRg0tzhVZfeC2vLOA+65xIdx31pTf0fI+tfndS9PG/3uYqudw==
35+
"@rapid-build-ui/rb-popover@^0.0.16":
36+
version "0.0.16"
37+
resolved "https://registry.yarnpkg.com/@rapid-build-ui/rb-popover/-/rb-popover-0.0.16.tgz#092775bc47f522cabac52ef6be85e6c4ee29f5f0"
38+
integrity sha512-IgcVQVlrnxH/vjCLNT9T84DfsaCRhjnP5cDAqni8RkWzf9DKbbtbGfDxBzvbIaPh9z7GbJHUmlxfo8W4VvRbKg==
3939
dependencies:
40-
"@rapid-build-ui/rb-base" "^0.0.8"
41-
"@rapid-build-ui/rb-button" "^0.0.15"
40+
"@rapid-build-ui/rb-base" "^0.0.9"
41+
"@rapid-build-ui/rb-button" "^0.0.16"
4242

4343
lit-html@^1.0.0:
4444
version "1.0.0"

0 commit comments

Comments
 (0)