Skip to content

Commit 56566c2

Browse files
Merge pull request #15 from webdevnerdstuff/dev
1.0.0-beta-1.3
2 parents fd0cbe6 + bfe021d commit 56566c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2919
-2585
lines changed

Diff for: dist/plugin/composables/classes.d.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { UseDisplayContainerClass, UseDisplayInputControlClass, UseDisplaySelectionControlClass, UseDisplayValueClass, UseFieldContainerClass, UseInlineFieldsContainerClass } from '../../types';
1+
import { UseCancelButtonClass, UseDisplayContainerClass, UseDisplayInputControlClass, UseDisplaySelectionControlClass, UseDisplayValueClass, UseFieldContainerClass, UseInlineFieldsContainerClass } from '../../types';
22
export declare const useInlineFieldsContainerClass: UseInlineFieldsContainerClass;
33
export declare const useDisplayContainerClass: UseDisplayContainerClass;
44
export declare const useDisplayInputControlClasses: UseDisplayInputControlClass;
55
export declare const useDisplaySelectionControlClasses: UseDisplaySelectionControlClass;
66
export declare const useDisplayValueClass: UseDisplayValueClass;
77
export declare const useFieldContainerClass: UseFieldContainerClass;
88
export declare const useSaveFieldsContainerClass: () => object;
9+
export declare const useCancelButtonClass: UseCancelButtonClass;

Diff for: dist/plugin/utils/props.d.ts

+16-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export declare const sharedProps: {
33
cancelButtonColor: string;
44
cancelButtonSize: string;
55
cancelButtonTitle: string;
6-
cancelButtonVariant: "tonal";
6+
cancelButtonVariant: "text";
77
cancelIcon: undefined;
88
cancelIconColor: string;
99
closeSiblings: boolean;
@@ -28,6 +28,15 @@ declare const checkboxProps: {
2828
falseIcon: undefined;
2929
icons: boolean;
3030
trueIcon: undefined;
31+
hideSaveIcon: boolean;
32+
loadingIcon: undefined;
33+
loadingIconColor: string;
34+
saveButtonColor: string;
35+
saveButtonSize: string;
36+
saveButtonTitle: string;
37+
saveButtonVariant: "text";
38+
saveIcon: undefined;
39+
saveIconColor: string;
3140
falseValue: boolean;
3241
iconFalse: undefined;
3342
iconFalseColor: string;
@@ -40,7 +49,7 @@ declare const checkboxProps: {
4049
cancelButtonColor: string;
4150
cancelButtonSize: string;
4251
cancelButtonTitle: string;
43-
cancelButtonVariant: "tonal";
52+
cancelButtonVariant: "text";
4453
cancelIcon: undefined;
4554
cancelIconColor: string;
4655
closeSiblings: boolean;
@@ -84,7 +93,7 @@ declare const selectProps: {
8493
cancelButtonColor: string;
8594
cancelButtonSize: string;
8695
cancelButtonTitle: string;
87-
cancelButtonVariant: "tonal";
96+
cancelButtonVariant: "text";
8897
cancelIcon: undefined;
8998
cancelIconColor: string;
9099
closeSiblings: boolean;
@@ -120,7 +129,7 @@ declare const switchProps: {
120129
cancelButtonColor: string;
121130
cancelButtonSize: string;
122131
cancelButtonTitle: string;
123-
cancelButtonVariant: "tonal";
132+
cancelButtonVariant: "text";
124133
cancelIcon: undefined;
125134
cancelIconColor: string;
126135
closeSiblings: boolean;
@@ -149,7 +158,7 @@ declare const textareaProps: {
149158
cancelButtonColor: string;
150159
cancelButtonSize: string;
151160
cancelButtonTitle: string;
152-
cancelButtonVariant: "tonal";
161+
cancelButtonVariant: "text";
153162
cancelIcon: undefined;
154163
cancelIconColor: string;
155164
closeSiblings: boolean;
@@ -196,7 +205,7 @@ declare const textFieldProps: {
196205
cancelButtonColor: string;
197206
cancelButtonSize: string;
198207
cancelButtonTitle: string;
199-
cancelButtonVariant: "tonal";
208+
cancelButtonVariant: "text";
200209
cancelIcon: undefined;
201210
cancelIconColor: string;
202211
closeSiblings: boolean;
@@ -217,4 +226,4 @@ declare const textFieldProps: {
217226
underlined: boolean;
218227
valueColor: string;
219228
};
220-
export { checkboxProps, selectProps, switchProps, textFieldProps, textareaProps };
229+
export { checkboxProps, selectProps, switchProps, textFieldProps, textareaProps, };

Diff for: dist/scss/main.scss

+42-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@
44
--v-inline-fields-top-padding-default: 21px;
55
}
66

7+
%clearable-icons {
8+
.v-field__clearable,
9+
.v-field__append-inner,
10+
.v-input__append {
11+
align-items: flex-end !important;
12+
padding-bottom: 8px !important;
13+
padding-top: 0 !important;
14+
}
15+
}
16+
717
.v-inline-fields {
818
&--container {
919
display: flex;
@@ -23,6 +33,18 @@
2333
}
2434
}
2535

36+
&-icon-set {
37+
&-fa {
38+
.v-field__clearable {
39+
font-size: .8rem;
40+
}
41+
42+
.v-field__append-inner {
43+
align-items: center;
44+
}
45+
}
46+
}
47+
2648
// ------------------------------------------------ Table Field (tableField) Prop = true //
2749
&-table {
2850
--v-inline-fields-top-padding-compact: 0;
@@ -87,8 +109,10 @@
87109
&-compact,
88110
&-comfortable,
89111
&-default {
112+
@extend %clearable-icons;
113+
90114
.v-field__append-inner {
91-
padding: 0 !important;
115+
padding: 0 0 6px !important;
92116
}
93117

94118
.v-field--variant-underlined,
@@ -101,6 +125,8 @@
101125

102126
&-compact,
103127
&-comfortable {
128+
@extend %clearable-icons;
129+
104130
.v-field--variant-underlined,
105131
.v-field--variant-plain {
106132
.v-field__input {
@@ -110,6 +136,8 @@
110136
}
111137

112138
&-default {
139+
@extend %clearable-icons;
140+
113141
.v-field--variant-underlined,
114142
.v-field--variant-plain {
115143
.v-field__input {
@@ -132,6 +160,8 @@
132160
&-compact,
133161
&-comfortable,
134162
&-default {
163+
@extend %clearable-icons;
164+
135165
.v-field--variant-underlined,
136166
.v-field--variant-plain {
137167
.v-field__input {
@@ -142,6 +172,8 @@
142172

143173
&-compact,
144174
&-comfortable {
175+
@extend %clearable-icons;
176+
145177
.v-field--variant-underlined,
146178
.v-field--variant-plain {
147179
.v-field__input {
@@ -151,6 +183,8 @@
151183
}
152184

153185
&-default {
186+
@extend %clearable-icons;
187+
154188
.v-field--variant-underlined,
155189
.v-field--variant-plain {
156190
.v-field__input {
@@ -228,4 +262,11 @@
228262
&--boolean-icons {
229263
font-size: calc(var(--v-icon-size-multiplier) * 1em);
230264
}
265+
266+
.truncate {
267+
overflow: hidden;
268+
text-overflow: ellipsis;
269+
white-space: nowrap;
270+
width: 250px;
271+
}
231272
}

Diff for: dist/types/index.d.ts

+8-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export interface SharedProps {
5959
underlined?: boolean;
6060
valueColor?: string;
6161
}
62-
export interface VInlineCheckboxProps extends Omit<SharedProps, 'autofocus' | 'hideSaveIcon' | 'loadingIcon' | 'loadingIconColor' | 'saveButtonColor' | 'saveButtonSize' | 'saveIcon' | 'saveIconColor' | 'saveButtonTitle' | 'saveButtonVariant' | 'truncateLength' | 'truncateSuffix'> {
62+
export interface VInlineCheckboxProps extends Omit<SharedProps, 'autofocus' | 'truncateLength' | 'truncateSuffix'> {
6363
density?: VCheckbox['$props']['density'];
6464
falseIcon?: string | undefined;
6565
trueIcon?: string | undefined;
@@ -82,12 +82,14 @@ export interface VInlineSwitchProps extends Omit<SharedProps, 'autofocus' | 'hid
8282
}
8383
export interface VInlineTextareaProps extends Omit<SharedProps, 'falseValue' | 'iconFalse' | 'iconFalseColor' | 'iconFalseTitle' | 'iconTrue' | 'iconTrueColor' | 'iconTrueTitle' | 'icons' | 'trueValue'> {
8484
autoGrow?: VTextarea['$props']['autoGrow'];
85+
clearIcon?: string | undefined;
8586
density?: VTextarea['$props']['density'];
8687
rows?: VTextarea['$props']['rows'];
8788
rules?: VTextarea['$props']['rules'];
8889
variant?: VTextarea['$props']['variant'];
8990
}
9091
export interface VInlineTextFieldProps extends Omit<SharedProps, 'falseValue' | 'iconFalse' | 'iconFalseColor' | 'iconFalseTitle' | 'iconTrue' | 'iconTrueColor' | 'iconTrueTitle' | 'icons' | 'trueValue'> {
92+
clearIcon?: string | undefined;
9193
density?: VTextField['$props']['density'];
9294
rules?: VTextField['$props']['rules'];
9395
variant?: VTextField['$props']['variant'];
@@ -97,6 +99,11 @@ export interface BooleanIcons extends Required<Pick<SharedProps, 'iconFalseColor
9799
export interface SaveFieldButtons extends Required<Pick<SharedProps, 'cancelButtonColor' | 'cancelButtonSize' | 'cancelButtonVariant' | 'cancelButtonTitle' | 'cancelIconColor' | 'error' | 'fieldOnly' | 'hideSaveIcon' | 'loadingIconColor' | 'saveButtonColor' | 'saveButtonSize' | 'saveButtonTitle' | 'saveButtonVariant' | 'saveIconColor' | 'saveButtonVariant'>>, Pick<SharedProps, 'cancelIcon' | 'loadingIcon' | 'saveIcon'> {
98100
loading: boolean;
99101
}
102+
export interface UseCancelButtonClass {
103+
(options: {
104+
cancelButtonVariant?: SharedProps['cancelButtonVariant'];
105+
}): object;
106+
}
100107
export interface UseInlineFieldsContainerClass {
101108
(options: {
102109
density?: GlobalDensity;

Diff for: dist/vuetify-inline-fields.cjs.js

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)