vueless 0.0.619 → 0.0.620
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.
package/composables/useUI.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { ref, watch, watchEffect, getCurrentInstance, toValue, useAttrs, computed } from "vue";
|
|
2
|
-
import { merge } from "lodash-es";
|
|
3
2
|
|
|
4
3
|
import { cx, cva, setColor, getColor, vuelessConfig, getMergedConfig } from "../utils/ui.ts";
|
|
5
4
|
import { isCSR } from "../utils/helper.ts";
|
|
@@ -158,7 +157,10 @@ export default function useUI<T>(
|
|
|
158
157
|
vuelessAttrs.value = {
|
|
159
158
|
...commonAttrs,
|
|
160
159
|
class: cx([...extendsClasses, toValue(classes)]),
|
|
161
|
-
config:
|
|
160
|
+
config: getMergedConfig({
|
|
161
|
+
defaultConfig: extendsConfigAttr,
|
|
162
|
+
globalConfig: configAttr,
|
|
163
|
+
}),
|
|
162
164
|
...getDefaults({
|
|
163
165
|
...(extendsConfigAttr.defaults || {}),
|
|
164
166
|
...(configAttr.defaults || {}),
|
package/package.json
CHANGED
|
@@ -93,31 +93,22 @@ export default /*tw*/ {
|
|
|
93
93
|
periodDateCurrentSelected: "{>periodDate} {>periodDateSelected} {>periodDateCurrent}",
|
|
94
94
|
customRangeDescription: "",
|
|
95
95
|
rangeInputWrapper: "flex mt-4 -space-x-px group/range-input-wrapper",
|
|
96
|
-
|
|
96
|
+
rangeInput: {
|
|
97
97
|
base: "{UInput}",
|
|
98
98
|
inputLabel: {
|
|
99
99
|
base: "{ULabel}",
|
|
100
|
-
wrapper: "w-full
|
|
100
|
+
wrapper: "w-full transition",
|
|
101
101
|
description: "hidden",
|
|
102
102
|
},
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
103
|
+
wrapper: "focus-within:z-10 focus-within:ring-0 focus-within:border-gray-500 hover:focus-within:border-gray-500",
|
|
104
|
+
},
|
|
105
|
+
rangeInputFirst: {
|
|
106
|
+
base: "{UInput} {>rangeInput}",
|
|
107
|
+
wrapper: "rounded-r-none",
|
|
108
108
|
},
|
|
109
109
|
rangeInputLast: {
|
|
110
|
-
base: "{UInput}",
|
|
111
|
-
|
|
112
|
-
base: "{ULabel}",
|
|
113
|
-
wrapper: "w-full hover:z-10 focus:z-10",
|
|
114
|
-
description: "hidden",
|
|
115
|
-
},
|
|
116
|
-
input: "rounded-l-none",
|
|
117
|
-
wrapper: `
|
|
118
|
-
rounded-l-none
|
|
119
|
-
focus-within:z-10 focus-within:ring-0 focus-within:border-gray-500 hover:focus-within:border-gray-500
|
|
120
|
-
`,
|
|
110
|
+
base: "{UInput} {>rangeInput}",
|
|
111
|
+
wrapper: "rounded-l-none",
|
|
121
112
|
},
|
|
122
113
|
rangeInputError: "text-xs font-normal leading-none mt-2 text-center text-red-500",
|
|
123
114
|
datepickerCalendar: {
|