Skip to content

Commit 1bae0cf

Browse files
committed
merge
2 parents bffea00 + dfac784 commit 1bae0cf

File tree

6 files changed

+11
-2
lines changed

6 files changed

+11
-2
lines changed

packages/ember-input-validation/addon/components/tpk-validation-checkbox.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
@type={{@type}}
55
@classless={{@classless}}
66
@value={{@value}}
7+
@disabled={{@disabled}}
78
@onChange={{this.onChange}}
89
...attributes
910
data-has-error='{{this.hasError}}'

packages/ember-input/addon/components/tpk-checkbox.hbs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
'tpk-checkbox/input'
1818
guid=this.guid
1919
checked=@checked
20+
disabled=@disabled
2021
changeEvent=this.changeEvent
2122
onChange=this.onChange
2223
classless=@classless
@@ -31,6 +32,7 @@
3132
@guid={{this.guid}}
3233
@onChange={{this.onChange}}
3334
@changeEvent={{this.changeEvent}}
35+
@disabled={{@disabled}}
3436
@checked={{@checked}}
3537
@classless={{@classless}}
3638
/>
@@ -40,4 +42,4 @@
4042
@label={{@label}}
4143
/>
4244
{{/if}}
43-
</div>
45+
</div>

packages/ember-input/addon/components/tpk-checkbox/input.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
class={{unless @classless 'tpk-checkbox-input'}}
33
id={{@guid}}
44
checked={{@checked}}
5+
disabled={{@disabled}}
56
type='checkbox'
67
{{on @changeEvent @onChange}}
78
...attributes

packages/ember-input/addon/components/tpk-datepicker/input.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
@allowInput={{@allowInput}}
1616
placeholder={{@placeholder}}
1717
id={{@guid}}
18+
@static={{true}}
1819
class={{unless @classless 'tpk-datepicker-input'}}
1920
...attributes
2021
/>

packages/ember-input/tests/dummy/app/styles/app.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@
33
@import 'tailwindcss/utilities';
44
@import 'tpk-ember-input';
55

6+
7+
.flatpickr-wrapper {
8+
@apply w-full;
9+
}

packages/ember-input/tests/integration/components/tpk-datepicker-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* eslint-disable qunit/require-expect */
33
import { module, test } from 'qunit';
44
import { setupRenderingTest } from 'ember-qunit';
5-
import { render, findAll } from '@ember/test-helpers';
5+
import { findAll, render } from '@ember/test-helpers';
66
import hbs from 'htmlbars-inline-precompile';
77
// @ts-expect-error
88
import { setFlatpickrDate } from 'ember-flatpickr/test-support/helpers';

0 commit comments

Comments
 (0)