@r2digisolutions/components 0.21.8 → 0.21.9

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.
@@ -3,6 +3,8 @@
3
3
  import {
4
4
  getFormContext,
5
5
  resolveFormFieldState,
6
+ resolveRemoteInputProps,
7
+ parseRemoteFieldName,
6
8
  applyFormDataSync
7
9
  } from '../../../utils/formContext.js';
8
10
 
@@ -43,14 +45,27 @@
43
45
  }: FormNumberInputProps = $props();
44
46
 
45
47
  const form = getFormContext();
48
+ const parsed = $derived(parseRemoteFieldName(name));
49
+ const logicalName = $derived(parsed.logicalName);
50
+ const htmlName = $derived.by(() => {
51
+ if (parsed.isEncoded) return parsed.htmlName;
52
+ return resolveRemoteInputProps(form?.remoteFormId, name, 'number').name;
53
+ });
46
54
  const resolved = $derived(
47
- resolveFormFieldState({ name, errorMessage, helperText, status, disabled, form })
55
+ resolveFormFieldState({
56
+ name: logicalName,
57
+ errorMessage,
58
+ helperText,
59
+ status,
60
+ disabled,
61
+ form
62
+ })
48
63
  );
49
64
 
50
65
  $effect(() => {
51
- if (!bindData || !name || !form) return;
66
+ if (!bindData || !logicalName || !form) return;
52
67
  applyFormDataSync({
53
- fromCtx: form.data[name],
68
+ fromCtx: form.data[logicalName],
54
69
  getLocal: () => value,
55
70
  setLocal: (v) => {
56
71
  value = v;
@@ -61,9 +76,9 @@
61
76
 
62
77
  function handleChange(next: number) {
63
78
  value = next;
64
- if (bindData && name && form) {
65
- form.setData(name, next);
66
- form.clearError(name);
79
+ if (bindData && logicalName && form) {
80
+ form.setData(logicalName, next);
81
+ form.clearError(logicalName);
67
82
  }
68
83
  onchange?.(next);
69
84
  }
@@ -71,7 +86,7 @@
71
86
 
72
87
  <div class={['w-full', className]}>
73
88
  <NumberInput
74
- {name}
89
+ name={htmlName}
75
90
  {label}
76
91
  {min}
77
92
  {max}
@@ -5,6 +5,8 @@
5
5
  import {
6
6
  getFormContext,
7
7
  resolveFormFieldState,
8
+ resolveRemoteInputProps,
9
+ parseRemoteFieldName,
8
10
  applyFormDataSync
9
11
  } from '../../../utils/formContext.js';
10
12
 
@@ -48,14 +50,27 @@
48
50
  }: FormSelectProps = $props();
49
51
 
50
52
  const form = getFormContext();
53
+ const parsed = $derived(parseRemoteFieldName(name));
54
+ const logicalName = $derived(parsed.logicalName);
55
+ const htmlName = $derived.by(() => {
56
+ if (parsed.isEncoded) return parsed.htmlName;
57
+ return resolveRemoteInputProps(form?.remoteFormId, name, 'text').name;
58
+ });
51
59
  const resolved = $derived(
52
- resolveFormFieldState({ name, errorMessage, helperText, status, disabled, form })
60
+ resolveFormFieldState({
61
+ name: logicalName,
62
+ errorMessage,
63
+ helperText,
64
+ status,
65
+ disabled,
66
+ form
67
+ })
53
68
  );
54
69
 
55
70
  $effect(() => {
56
- if (!bindData || !name || !form) return;
71
+ if (!bindData || !logicalName || !form) return;
57
72
  applyFormDataSync({
58
- fromCtx: form.data[name],
73
+ fromCtx: form.data[logicalName],
59
74
  getLocal: () => value,
60
75
  setLocal: (v) => {
61
76
  value = v;
@@ -66,9 +81,9 @@
66
81
 
67
82
  function handleChange(next: string) {
68
83
  value = next;
69
- if (bindData && name && form) {
70
- form.setData(name, next);
71
- form.clearError(name);
84
+ if (bindData && logicalName && form) {
85
+ form.setData(logicalName, next);
86
+ form.clearError(logicalName);
72
87
  }
73
88
  onchange?.(next);
74
89
  }
@@ -77,7 +92,7 @@
77
92
  <div class={['w-full', className]}>
78
93
  <Select
79
94
  {id}
80
- {name}
95
+ name={htmlName}
81
96
  {label}
82
97
  {placeholder}
83
98
  {options}
@@ -3,6 +3,8 @@
3
3
  import {
4
4
  getFormContext,
5
5
  resolveFormFieldState,
6
+ resolveRemoteInputProps,
7
+ parseRemoteFieldName,
6
8
  applyFormDataSync
7
9
  } from '../../../utils/formContext.js';
8
10
 
@@ -52,14 +54,27 @@
52
54
  }: FormTextareaProps = $props();
53
55
 
54
56
  const form = getFormContext();
57
+ const parsed = $derived(parseRemoteFieldName(name));
58
+ const logicalName = $derived(parsed.logicalName);
59
+ const htmlName = $derived.by(() => {
60
+ if (parsed.isEncoded) return parsed.htmlName;
61
+ return resolveRemoteInputProps(form?.remoteFormId, name, 'text').name;
62
+ });
55
63
  const resolved = $derived(
56
- resolveFormFieldState({ name, errorMessage, helperText, status, disabled, form })
64
+ resolveFormFieldState({
65
+ name: logicalName,
66
+ errorMessage,
67
+ helperText,
68
+ status,
69
+ disabled,
70
+ form
71
+ })
57
72
  );
58
73
 
59
74
  $effect(() => {
60
- if (!bindData || !name || !form) return;
75
+ if (!bindData || !logicalName || !form) return;
61
76
  applyFormDataSync({
62
- fromCtx: form.data[name],
77
+ fromCtx: form.data[logicalName],
63
78
  getLocal: () => value,
64
79
  setLocal: (v) => {
65
80
  value = v;
@@ -69,9 +84,9 @@
69
84
  });
70
85
 
71
86
  function handleInput(e: Event) {
72
- if (bindData && name && form) {
73
- form.setData(name, (e.currentTarget as HTMLTextAreaElement).value);
74
- form.clearError(name);
87
+ if (bindData && logicalName && form) {
88
+ form.setData(logicalName, (e.currentTarget as HTMLTextAreaElement).value);
89
+ form.clearError(logicalName);
75
90
  }
76
91
  oninput?.(e);
77
92
  }
@@ -80,7 +95,7 @@
80
95
  <div class={['w-full', className]}>
81
96
  <Textarea
82
97
  {id}
83
- {name}
98
+ name={htmlName}
84
99
  {label}
85
100
  {placeholder}
86
101
  disabled={resolved.disabled}
@@ -60,11 +60,10 @@ export declare function getRemoteFormId(action: string | undefined | null): stri
60
60
  * Resolve HTML input props for a field inside a Kit remote form.
61
61
  * Prefer a precomputed `formId` string so fields never touch Kit proxies.
62
62
  *
63
- * Kit’s `fields.x.as(type)` uses plain names (`email`, `n:age`). Do **not** append
64
- * `/formId` — remote ids look like `hash/name` and would produce invalid paths
65
- * (`email/dp12ax/login_remote`) that break `convert_formdata`.
63
+ * Kit requires names that end with `/${formId}` (from `.as()`), e.g.
64
+ * `email/1p9kxmo/login_user` or `n:age/1p9kxmo/login_user`.
66
65
  */
67
- export declare function resolveRemoteInputProps(_formId: string | null | undefined, logicalName: string | undefined, type?: string): ResolvedRemoteInputProps;
66
+ export declare function resolveRemoteInputProps(formId: string | null | undefined, logicalName: string | undefined, type?: string): ResolvedRemoteInputProps;
68
67
  export type ParsedRemoteFieldName = {
69
68
  /** Field path for errors / `form.data` (`email`, `items[0].name`) */
70
69
  logicalName: string | undefined;
@@ -81,8 +80,8 @@ export type ParsedRemoteFieldName = {
81
80
  * Otherwise treats the first `/` after an optional `n:`/`b:` prefix as the form-id boundary
82
81
  * (logical paths use `.` / `[n]`, never `/`).
83
82
  *
84
- * Note: current Kit `.as()` emits plain names without `/formId`. Encoding with the
85
- * full remote id (`hash/name`) must not be reintroduced — it breaks convert_formdata.
83
+ * Note: Kit `.as()` emits names ending with `/${formId}` (e.g. `email/hash/login`).
84
+ * `resolveRemoteInputProps` must append the same suffix when given a logical name.
86
85
  */
87
86
  export declare function parseRemoteFieldName(name: string | undefined, formId?: string | null): ParsedRemoteFieldName;
88
87
  /**
@@ -21,19 +21,25 @@ export function getRemoteFormId(action) {
21
21
  * Resolve HTML input props for a field inside a Kit remote form.
22
22
  * Prefer a precomputed `formId` string so fields never touch Kit proxies.
23
23
  *
24
- * Kit’s `fields.x.as(type)` uses plain names (`email`, `n:age`). Do **not** append
25
- * `/formId` — remote ids look like `hash/name` and would produce invalid paths
26
- * (`email/dp12ax/login_remote`) that break `convert_formdata`.
24
+ * Kit requires names that end with `/${formId}` (from `.as()`), e.g.
25
+ * `email/1p9kxmo/login_user` or `n:age/1p9kxmo/login_user`.
27
26
  */
28
- export function resolveRemoteInputProps(_formId, logicalName, type = 'text') {
27
+ export function resolveRemoteInputProps(formId, logicalName, type = 'text') {
29
28
  if (!logicalName)
30
29
  return {};
30
+ // Already Kit-encoded (contains `/formId` or was passed from `.as()`).
31
+ if (logicalName.includes('/')) {
32
+ return { name: logicalName };
33
+ }
31
34
  let prefix = '';
32
35
  if (type === 'number' || type === 'range')
33
36
  prefix = 'n:';
34
37
  else if (type === 'checkbox' || type === 'boolean')
35
38
  prefix = 'b:';
36
- return { name: `${prefix}${logicalName}` };
39
+ const base = `${prefix}${logicalName}`;
40
+ if (!formId)
41
+ return { name: base };
42
+ return { name: `${base}/${formId}` };
37
43
  }
38
44
  /**
39
45
  * Split a Kit-encoded HTML `name` (`email/1p9kxmo/login_user`, `n:age/...`)
@@ -43,8 +49,8 @@ export function resolveRemoteInputProps(_formId, logicalName, type = 'text') {
43
49
  * Otherwise treats the first `/` after an optional `n:`/`b:` prefix as the form-id boundary
44
50
  * (logical paths use `.` / `[n]`, never `/`).
45
51
  *
46
- * Note: current Kit `.as()` emits plain names without `/formId`. Encoding with the
47
- * full remote id (`hash/name`) must not be reintroduced — it breaks convert_formdata.
52
+ * Note: Kit `.as()` emits names ending with `/${formId}` (e.g. `email/hash/login`).
53
+ * `resolveRemoteInputProps` must append the same suffix when given a logical name.
48
54
  */
49
55
  export function parseRemoteFieldName(name, formId) {
50
56
  if (!name) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@r2digisolutions/components",
3
- "version": "0.21.8",
3
+ "version": "0.21.9",
4
4
  "private": false,
5
5
  "description": "R2DigiSolutions Svelte 5 component library — Atomic Design, Tailwind 4, Light/Dark mode",
6
6
  "license": "MIT",