@marianmeres/stuic 1.122.0 → 1.124.0

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.
Files changed (8) hide show
  1. package/dist/components/Input/Field.svelte +3 -3
  2. package/dist/components/Input/FieldCheckbox.svelte +2 -2
  3. package/dist/components/Input/FieldSelect.svelte +3 -3
  4. package/dist/components/Input/Fieldset.svelte +1 -5
  5. package/dist/components/Input/XFieldRadioInternal.svelte +2 -2
  6. package/dist/utils/tw-merge2.d.ts +1 -1
  7. package/dist/utils/tw-merge2.js +6 -2
  8. package/package.json +1 -1
package/dist/components/Input/Field.svelte CHANGED
@@ -123,21 +123,21 @@ const _collectClasses = (k, extra = "") => [
123
123
  extra || "",
124
124
  _class?.[k] || "",
125
125
  classBySize?.[size]?.[k] || ""
126
- ];
126
+ ].join(" ");
127
127
  $:
128
128
  _boxClass = twMerge2(_collectClasses("box"));
129
129
  $:
130
130
  _labelClass = twMerge2(
131
131
  _collectClasses(
132
132
  "label",
133
- showAsterixOnRequired && required ? _collectClasses("asterix").join(" ") : ""
133
+ showAsterixOnRequired && required ? _collectClasses("asterix") : ""
134
134
  )
135
135
  );
136
136
  $:
137
137
  _wrapClass = twMerge2(
138
138
  _collectClasses(
139
139
  "wrap",
140
- validation && !validation.valid ? _collectClasses("invalid").join(" ") : ""
140
+ validation && !validation.valid ? _collectClasses("invalid") : ""
141
141
  )
142
142
  );
143
143
  $:
package/dist/components/Input/FieldCheckbox.svelte CHANGED
@@ -71,14 +71,14 @@ const _collectClasses = (k, extra = "") => [
71
71
  extra || "",
72
72
  _class?.[k] || "",
73
73
  classBySize?.[size]?.[k] || ""
74
- ];
74
+ ].join(" ");
75
75
  $:
76
76
  _boxClass = twMerge2(_collectClasses("box"));
77
77
  $:
78
78
  _inputClass = twMerge2(
79
79
  _collectClasses(
80
80
  "input",
81
- validation && !validation.valid ? _collectClasses("invalid").join(" ") : ""
81
+ validation && !validation.valid ? _collectClasses("invalid") : ""
82
82
  )
83
83
  );
84
84
  $:
package/dist/components/Input/FieldSelect.svelte CHANGED
@@ -124,21 +124,21 @@ const _collectClasses = (k, extra = "") => [
124
124
  extra || "",
125
125
  _class?.[k] || "",
126
126
  classBySize?.[size]?.[k] || ""
127
- ];
127
+ ].join(" ");
128
128
  $:
129
129
  _boxClass = twMerge2(_collectClasses("box"));
130
130
  $:
131
131
  _labelClass = twMerge2(
132
132
  _collectClasses(
133
133
  "label",
134
- showAsterixOnRequired && required ? _collectClasses("asterix").join(" ") : ""
134
+ showAsterixOnRequired && required ? _collectClasses("asterix") : ""
135
135
  )
136
136
  );
137
137
  $:
138
138
  _wrapClass = twMerge2(
139
139
  _collectClasses(
140
140
  "wrap",
141
- validation && !validation.valid ? _collectClasses("invalid").join(" ") : ""
141
+ validation && !validation.valid ? _collectClasses("invalid") : ""
142
142
  )
143
143
  );
144
144
  $:
package/dist/components/Input/Fieldset.svelte CHANGED
@@ -12,11 +12,7 @@ export class FieldsetConfig {
12
12
  <script>let _class = {};
13
13
  export { _class as class };
14
14
  export let legend = "";
15
- const _collectClasses = (k, extra = "") => [
16
- _PRESET?.[k] || "",
17
- FieldsetConfig?.class?.[k] || "",
18
- _class?.[k] || ""
19
- ];
15
+ const _collectClasses = (k, extra = "") => [_PRESET?.[k] || "", FieldsetConfig?.class?.[k] || "", _class?.[k] || ""].join(" ");
20
16
  </script>
21
17
 
22
18
  <fieldset class={twMerge2(_collectClasses('box'))}>
package/dist/components/Input/XFieldRadioInternal.svelte CHANGED
@@ -63,14 +63,14 @@ const _collectClasses = (k, extra = "") => [
63
63
  extra || "",
64
64
  _class?.[k] || "",
65
65
  classBySize?.[size]?.[k] || ""
66
- ];
66
+ ].join(" ");
67
67
  $:
68
68
  _boxClass = twMerge2(_collectClasses("box"));
69
69
  $:
70
70
  _inputClass = twMerge2(
71
71
  _collectClasses(
72
72
  "input",
73
- validation && !validation.valid ? _collectClasses("invalid").join(" ") : ""
73
+ validation && !validation.valid ? _collectClasses("invalid") : ""
74
74
  )
75
75
  );
76
76
  $:
package/dist/utils/tw-merge2.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export declare const clsClean: (s: string) => string;
1
+ export declare const clsClean: (s: string | string[]) => string;
2
2
  export declare const twMerge2: (...args: any[]) => string;
package/dist/utils/tw-merge2.js CHANGED
@@ -1,5 +1,9 @@
1
1
  import { twMerge } from 'tailwind-merge';
2
- export const clsClean = (s) => `${s || ''}`.replace(/\s+/gi, ' ').trim();
3
- // twMerge does not seem to handle "\t" and/or "\n" within the input strings correctly,
2
+ export const clsClean = (s) => {
3
+ if (Array.isArray(s))
4
+ s = s.join(' ');
5
+ return `${s || ''}`.replace(/\s+/g, ' ').trim();
6
+ };
7
+ // twMerge does not seem to handle "\r", "\n" and/or "\t" within the input strings correctly,
4
8
  // so we need to do the cleanup ourselves
5
9
  export const twMerge2 = (...args) => twMerge(...args.map(clsClean));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@marianmeres/stuic",
3
- "version": "1.122.0",
3
+ "version": "1.124.0",
4
4
  "scripts": {
5
5
  "dev": "vite dev",
6
6
  "build": "vite build && npm run package && node ./scripts/date.js",