Skip to content

Commit 11c76f2

Browse files
jyouncejyounce
committed
chore(merge): continuous
2 parents 6b26f7f + f29e36c commit 11c76f2

File tree

5 files changed

+26
-28
lines changed

5 files changed

+26
-28
lines changed

‎src/client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737
},
3838
"flat": true,
3939
"dependencies": {
40-
"@rapid-build-ui/rb-base": "^0.0.2"
40+
"@rapid-build-ui/rb-base": "^0.0.3"
4141
}
4242
}

‎src/client/scripts/appender.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ const Appender = Base => class extends Base {
1919
/* Private Methods
2020
******************/
2121
_addHiddenInput() { // :void
22-
this.elms.hiddenInput = document.createElement('input');
23-
this.elms.hiddenInput.setAttribute('hidden', true);
24-
this.elms.hiddenInput.setAttribute('name', this.name);
25-
this.elms.form.appendChild(this.elms.hiddenInput);
22+
this.rb.elms.hiddenInput = document.createElement('input');
23+
this.rb.elms.hiddenInput.setAttribute('hidden', true);
24+
this.rb.elms.hiddenInput.setAttribute('name', this.name);
25+
this.rb.elms.form.appendChild(this.rb.elms.hiddenInput);
2626
}
2727
_removeHiddenInput() { // :void
28-
this.elms.hiddenInput.remove();
28+
this.rb.elms.hiddenInput.remove();
2929
}
3030

3131
/* Event Management
@@ -34,7 +34,7 @@ const Appender = Base => class extends Base {
3434
this.rb.events.add(this, 'value-changed', this._setHiddenInputValue);
3535
if (!this.hasValidation) return;
3636
this.rb.events.add(this, 'validated', this._validateHiddenInput);
37-
this.rb.events.add(this.elms.hiddenInput, 'invalid', this._preventNativeErrorrMsg);
37+
this.rb.events.add(this.rb.elms.hiddenInput, 'invalid', this._preventNativeErrorrMsg);
3838
}
3939

4040
/* Event Handlers
@@ -44,12 +44,12 @@ const Appender = Base => class extends Base {
4444
}
4545
_setHiddenInputValue(evt) { // :void (required to natively submit the value)
4646
const value = evt.detail.value; // component value
47-
this.elms.hiddenInput.value = value;
47+
this.rb.elms.hiddenInput.value = value;
4848
}
4949
_validateHiddenInput(evt) { // :void
5050
const valid = evt.detail.valid; // :boolean
5151
const eMsg = valid ? '' : 'invalid'; // empty string sets validity.valid to true
52-
this.elms.hiddenInput.setCustomValidity(eMsg);
52+
this.rb.elms.hiddenInput.setCustomValidity(eMsg);
5353
}
5454
}
5555

‎src/client/scripts/defaults.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ const Defaults = Base => class extends Base {
88
************/
99
connectedCallback() { // :void
1010
super.connectedCallback && super.connectedCallback();
11-
this.elms = {
12-
form: this.closest('form')
13-
}
11+
this.rb.elms.form = this.closest('form');
1412
}
1513

1614
/* Properties
@@ -26,7 +24,7 @@ const Defaults = Base => class extends Base {
2624
/* Getters
2725
**********/
2826
get hasForm() { // :boolean (readonly: true if inside form)
29-
return !!this.elms.form;
27+
return !!this.rb.elms.form;
3028
}
3129
}
3230

‎src/client/scripts/validation/validation.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const Validation = Base => class extends Base {
1212
viewReady() { // :void
1313
super.viewReady && super.viewReady();
1414
if (!this.hasValidation) return;
15-
this.elms.input = this.shadowRoot.querySelector('input');
15+
this.rb.elms.input = this.shadowRoot.querySelector('input');
1616
this._attachValidationEvents();
1717
}
1818

@@ -59,7 +59,7 @@ const Validation = Base => class extends Base {
5959
}
6060
if (valid) {
6161
this._eMsg = '';
62-
this.elms.input.setCustomValidity('')
62+
this.rb.elms.input.setCustomValidity('')
6363
}
6464
this._valid = valid;
6565
this.rb.events.emit(this, 'validated', {
@@ -73,7 +73,7 @@ const Validation = Base => class extends Base {
7373
const out = Validators[validator](this.value);
7474
if (!out.valid) {
7575
this._eMsg = out.message || `${validator} ${Messages['default']}`;
76-
this.elms.input.setCustomValidity(out.message);
76+
this.rb.elms.input.setCustomValidity(out.message);
7777
}
7878
return out.valid;
7979
}
@@ -82,15 +82,15 @@ const Validation = Base => class extends Base {
8282
const out = Validators[key](this.value, validator[key]);
8383
if (!out.valid) {
8484
this._eMsg = out.message || `${validator} ${Messages['default']}`;
85-
this.elms.input.setCustomValidity(out.message);
85+
this.rb.elms.input.setCustomValidity(out.message);
8686
}
8787
return out.valid;
8888
}
8989
async _validateCustom(validator) { // :boolean (validator is function)
9090
let out = await validator(this.value);
9191
if (!out.valid) {
9292
this._eMsg = out.message || `${validator} ${Messages['default']}`;
93-
this.elms.input.setCustomValidity(out.message);
93+
this.rb.elms.input.setCustomValidity(out.message);
9494
}
9595
return out.valid;
9696
}
@@ -99,18 +99,18 @@ const Validation = Base => class extends Base {
9999
*******************/
100100
_attachValidationEvents() { // :void
101101
if (!this.hasForm) return;
102-
this.rb.events.add(this.elms.form, 'submit', this._validateForm);
102+
this.rb.events.add(this.rb.elms.form, 'submit', this._validateForm);
103103
}
104104

105105
/* Event Handlers
106106
*****************/
107107
_validateForm(evt) { // :void
108108
this.validate();
109-
if (this.elms.form.checkValidity()) return;
109+
if (this.rb.elms.form.checkValidity()) return;
110110
evt.preventDefault(); // prevents browser from submitting the form
111111
this._dirty = true; // TODO: improve
112112
this._blurred = true; // TODO: improve
113-
this.elms.input.focus(); // TODO: only focus first invalid form component
113+
this.rb.elms.input.focus(); // TODO: only focus first invalid form component
114114
}
115115
}
116116

‎src/client/yarn.lock

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

44

5-
"@rapid-build-ui/rb-base@^0.0.2":
6-
version "0.0.2"
7-
resolved "https://registry.yarnpkg.com/@rapid-build-ui/rb-base/-/rb-base-0.0.2.tgz#c79683ad6d021a60dce320ff8cbc3bcabf8bddcd"
5+
"@rapid-build-ui/rb-base@^0.0.3":
6+
version "0.0.3"
7+
resolved "https://registry.yarnpkg.com/@rapid-build-ui/rb-base/-/rb-base-0.0.3.tgz#799f2aa04b146122b901a74482572a6aff451399"
88
dependencies:
9-
lit-html "^0.11.1"
9+
lit-html "^0.11.3"
1010
skatejs "^5.2.4"
1111

12-
lit-html@^0.11.1:
13-
version "0.11.1"
14-
resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-0.11.1.tgz#ad3dcfea1dbaf65fadf335fa1e2bd9ac19255394"
12+
lit-html@^0.11.3:
13+
version "0.11.3"
14+
resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-0.11.3.tgz#34d6eb27ef0c7fdae542c7b50762526704605681"
1515

1616
skatejs@^5.2.4:
1717
version "5.2.4"

0 commit comments

Comments
 (0)