@dwidge/json-forms-expo 0.0.2 → 0.0.3

package/dist/types/hooks/index.d.ts

@@ -1,11 +1,12 @@
-export * from "./FileApi";
-export * from "./FileAttachmentApi";
-export * from "./FormApi";
-export * from "./FormAttachmentApi";
-export * from "./FormsContext";
-export * from "./createApi";
-export * from "./useCreateBlankAttachment";
-export * from "./useCreateBlankForm";
-export * from "./useCreateBlankFormAttachment";
-export * from "./useParams";
+export * from "./FileApi.js";
+export * from "./AttachmentApi.js";
+export * from "./SchemaApi.js";
+export * from "./FormApi.js";
+export * from "./FormsContext.js";
+export * from "./createApi.js";
+export * from "./useCreateBlankAttachment.js";
+export * from "./useCreateBlankSchema.js";
+export * from "./useCreateBlankForm.js";
+export * from "./useParams.js";
+export * from "./useIdFilter.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/types/hooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC"}

package/dist/types/hooks/useCreateBlankAttachment.d.ts

@@ -1,10 +1,10 @@
 export declare const useCreateBlankAttachment: ({ createAttachmentList, createFileList, AttachIds, }?: {
-    createAttachmentList?: ((list: Omit<Partial<import("..").FileAttachment>, "createdAt" | "createdBy">[]) => Promise<(Partial<import("..").FileAttachment> | null)[]>) | undefined;
+    createAttachmentList?: ((list: Omit<Partial<import("..").File1>, "createdAt" | "createdBy">[]) => Promise<(Partial<import("..").File1> | null)[]>) | undefined;
     createFileList?: ((list: Omit<Partial<import("..").File2>, "createdAt" | "createdBy">[]) => Promise<(Partial<import("..").File2> | null)[]>) | undefined;
     AttachIds?: (import("./useParams").Params & {
         AttachmentId?: string | null | undefined;
+        SchemaId?: string | null | undefined;
         FormId?: string | null | undefined;
-        FormAttachmentId?: string | null | undefined;
     }) | undefined;
-}) => (() => Promise<Partial<import("..").FileAttachment> | null>) | undefined;
+}) => (() => Promise<Partial<import("..").File1> | null>) | undefined;
 //# sourceMappingURL=useCreateBlankAttachment.d.ts.map

package/dist/types/hooks/useCreateBlankAttachment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCreateBlankAttachment.d.ts","sourceRoot":"","sources":["../../../src/hooks/useCreateBlankAttachment.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,wBAAwB;;;;;;;;8EAkBtB,CAAC"}
+{"version":3,"file":"useCreateBlankAttachment.d.ts","sourceRoot":"","sources":["../../../src/hooks/useCreateBlankAttachment.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,wBAAwB;;;;;;;;qEAkBtB,CAAC"}

package/dist/types/hooks/useCreateBlankForm.d.ts

@@ -1,6 +1,13 @@
-export declare const useCreateBlankForm: ({ createFormList, }?: {
+import { Schema1Key } from "../types/Schema1";
+export declare const useCreateBlankForm: ({ createSchemaList, createFormList, AttachmentIds, }?: {
+    createSchemaList?: ((list: Omit<Partial<import("../types/Schema1").Schema1>, "createdAt" | "createdBy">[]) => Promise<(Partial<import("../types/Schema1").Schema1> | null)[]>) | undefined;
     createFormList?: ((list: Omit<Partial<import("..").Form1>, "createdAt" | "createdBy">[]) => Promise<(Partial<import("..").Form1> | null)[]>) | undefined;
-}) => (() => Promise<{
+    AttachmentIds?: (import("./useParams").Params & {
+        AttachmentId?: string | null | undefined;
+        SchemaId?: string | null | undefined;
+        FormId?: string | null | undefined;
+    }) | undefined;
+}) => ((forms: Schema1Key[]) => Promise<{
     FormId: string | undefined;
-}>) | (() => undefined);
+}>) | (() => Promise<undefined>);
 //# sourceMappingURL=useCreateBlankForm.d.ts.map

package/dist/types/hooks/useCreateBlankForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useCreateBlankForm.d.ts","sourceRoot":"","sources":["../../../src/hooks/useCreateBlankForm.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,kBAAkB;;;;uBAKV,CAAC"}
+{"version":3,"file":"useCreateBlankForm.d.ts","sourceRoot":"","sources":["../../../src/hooks/useCreateBlankForm.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAK9C,eAAO,MAAM,kBAAkB;;;;;;;;eAMX,UAAU,EAAE;;gCAIL,CAAC"}

package/dist/types/hooks/useCreateBlankSchema.d.ts

@@ -0,0 +1,6 @@
+export declare const useCreateBlankSchema: ({ createList, }?: {
+    createList?: ((list: Omit<Partial<import("..").Schema1>, "createdAt" | "createdBy">[]) => Promise<(Partial<import("..").Schema1> | null)[]>) | undefined;
+}) => (() => Promise<{
+    SchemaId: string | undefined;
+}>) | undefined;
+//# sourceMappingURL=useCreateBlankSchema.d.ts.map

package/dist/types/hooks/useCreateBlankSchema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useCreateBlankSchema.d.ts","sourceRoot":"","sources":["../../../src/hooks/useCreateBlankSchema.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,oBAAoB;;;;eAKlB,CAAC"}

package/dist/types/hooks/useIdFilter.d.ts

@@ -0,0 +1,4 @@
+export declare const filterId: <T extends string | number>(id?: T | null) => {
+    id: T;
+} | undefined;
+//# sourceMappingURL=useIdFilter.d.ts.map

package/dist/types/hooks/useIdFilter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useIdFilter.d.ts","sourceRoot":"","sources":["../../../src/hooks/useIdFilter.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,IAAI;;aAChC,CAAC"}

package/dist/types/hooks/useParams.d.ts

@@ -1,7 +1,7 @@
 export type Params = Record<string, string | number | null | undefined>;
 export declare const useParams: () => Params & {
     AttachmentId?: string | null | undefined;
+    SchemaId?: string | null | undefined;
     FormId?: string | null | undefined;
-    FormAttachmentId?: string | null | undefined;
 };
 //# sourceMappingURL=useParams.d.ts.map

package/dist/types/hooks/useParams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useParams.d.ts","sourceRoot":"","sources":["../../../src/hooks/useParams.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;AACxE,eAAO,MAAM,SAAS,QAAO,MAAM,GAAG;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACzC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACnC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACN,CAAC"}
+{"version":3,"file":"useParams.d.ts","sourceRoot":"","sources":["../../../src/hooks/useParams.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;AACxE,eAAO,MAAM,SAAS,QAAO,MAAM,GAAG;IACpC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACrC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACI,CAAC"}

package/dist/types/index.d.ts

@@ -1,6 +1,6 @@
-export * from "./FileAttachment";
-export * from "./Form";
-export * from "./FormAttachment";
-export * from "./hooks";
-export * from "./types";
+export * from "./Attachment/index.js";
+export * from "./Schema/index.js";
+export * from "./Form/index.js";
+export * from "./hooks/index.js";
+export * from "./types/index.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,QAAQ,CAAC;AACvB,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC"}

package/dist/types/types/{FileAttachment.d.ts → File1.d.ts}

@@ -1,10 +1,10 @@
-export type FileAttachment = {
+export type File1 = {
     id: string;
     created: boolean;
     createdAt: number;
     createdBy: number | null;
     FileId: string | null;
+    SchemaId: string | null;
     FormId: string | null;
-    FormAttachmentId: string | null;
 };
-//# sourceMappingURL=FileAttachment.d.ts.map
+//# sourceMappingURL=File1.d.ts.map

package/dist/types/types/File1.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"File1.d.ts","sourceRoot":"","sources":["../../../src/types/File1.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC"}

package/dist/types/types/Form1.d.ts

@@ -3,9 +3,8 @@ export type Form1 = {
     created: boolean;
     createdAt: number;
     createdBy: number | null;
-    name: string | null;
-    type: string | null;
-    schema: string | null;
+    SchemaId: string | null;
+    data: string | null;
 };
 export type Form1Get = Partial<Form1>;
 export type Form1Set = Omit<Form1Get, "createdAt" | "createdBy">;

package/dist/types/types/Form1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Form1.d.ts","sourceRoot":"","sources":["../../../src/types/Form1.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAEtC,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,WAAW,CAAC,CAAC;AAEjE,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAE5C,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"Form1.d.ts","sourceRoot":"","sources":["../../../src/types/Form1.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAEtC,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,WAAW,CAAC,CAAC;AAEjE,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAE5C,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC"}

package/dist/types/types/Schema1.d.ts

@@ -0,0 +1,14 @@
+export type Schema1 = {
+    id: string;
+    created: boolean;
+    createdAt: number;
+    createdBy: number | null;
+    name: string | null;
+    type: string | null;
+    schema: string | null;
+};
+export type Schema1Get = Partial<Schema1>;
+export type Schema1Set = Omit<Schema1Get, "createdAt" | "createdBy">;
+export type Schema1Key = Pick<Schema1Get, "id">;
+export type Schema1Filter = Schema1Get;
+//# sourceMappingURL=Schema1.d.ts.map

package/dist/types/types/Schema1.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Schema1.d.ts","sourceRoot":"","sources":["../../../src/types/Schema1.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,OAAO,GAAG;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE1C,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,WAAW,GAAG,WAAW,CAAC,CAAC;AAErE,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AAEhD,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC"}

package/dist/types/types/index.d.ts

@@ -1,5 +1,5 @@
-export * from "./File2";
-export * from "./FileAttachment";
-export * from "./Form1";
-export * from "./FormAttachment";
+export * from "./File2.js";
+export * from "./File1.js";
+export * from "./Schema1.js";
+export * from "./Form1.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/types/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,kBAAkB,CAAC;AACjC,cAAc,SAAS,CAAC;AACxB,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwidge/json-forms-expo",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Editor for Json Forms.",
   "repository": {
     "type": "git",
@@ -22,21 +22,21 @@
   ],
   "peerDependencies": {
     "@dwidge/class-name-rnw": "^0.0.3",
-    "@dwidge/fallback-rnw": "^0.0.2",
-    "@dwidge/json-forms-paper": "^0.0.6",
-    "@dwidge/trace-js": "^0.0.8",
+    "@dwidge/fallback-rnw": "^0.0.3",
+    "@dwidge/json-forms-paper": "^0.0.7",
+    "@dwidge/trace-js": "^0.0.9",
     "@dwidge/axios-interceptor": "^0.0.2",
-    "@dwidge/components-expo": "^0.0.11",
-    "@dwidge/components-rnw": "^0.0.7",
-    "@dwidge/crud-api-react": "^0.0.10",
-    "@dwidge/hooks-expo": "^0.0.6",
-    "@dwidge/hooks-react": "^0.0.4",
-    "@dwidge/json-forms-designer": "^0.0.5",
-    "@dwidge/json-schema-form-rnw": "^0.0.6",
-    "@dwidge/query-axios-zod": "^0.0.13",
+    "@dwidge/components-expo": "^0.0.12",
+    "@dwidge/components-rnw": "^0.0.8",
+    "@dwidge/crud-api-react": "^0.0.11",
+    "@dwidge/hooks-expo": "^0.0.7",
+    "@dwidge/hooks-react": "^0.0.5",
+    "@dwidge/json-forms-designer": "^0.0.6",
+    "@dwidge/json-schema-form-rnw": "^0.0.7",
+    "@dwidge/query-axios-zod": "^0.0.14",
     "@dwidge/react-native-web-webview": "^0.0.4",
-    "@dwidge/utils-js": "^0.0.11",
-    "@dwidge/wmdb-expo": "^0.0.4",
+    "@dwidge/utils-js": "^0.0.12",
+    "@dwidge/wmdb-expo": "^0.0.6",
     "@dwidge/wmdb-expo-web": "^0.0.4",
     "@jsonforms/core": "^3.4.0",
     "@jsonforms/react": "^3.4.0",

package/src/{FileAttachment → Attachment}/AttachmentEdit.tsx

@@ -4,11 +4,12 @@
 
 import { FileEdit } from "@dwidge/components-expo";
 import { FileApi } from "../hooks/FileApi";
-import { FileAttachmentApi } from "../hooks/FileAttachmentApi";
+import { AttachmentApi } from "../hooks/AttachmentApi";
 import { useParams } from "../hooks/useParams";
+import { filterId } from "../hooks/useIdFilter";
 
 export const AttachmentEdit = ({
   id = useParams().AttachmentId,
-  attachment: [attachment] = FileAttachmentApi.useItem(id),
-  file: [file, setFile] = FileApi.useItem(attachment?.FileId),
+  attachment: [attachment] = AttachmentApi.useItem(filterId(id)),
+  file: [file, setFile] = FileApi.useItem(filterId(attachment?.FileId)),
 }) => <FileEdit file={[file, setFile]} />;

package/src/{FileAttachment → Attachment}/AttachmentListEdit.tsx

@@ -10,17 +10,17 @@ import {
 } from "@dwidge/components-rnw";
 import assert from "assert";
 import { useState } from "react";
-import { FileAttachmentApi } from "../hooks/FileAttachmentApi";
+import { AttachmentApi } from "../hooks/AttachmentApi";
 import { useCreateBlankAttachment } from "../hooks/useCreateBlankAttachment";
 import { Params, useParams } from "../hooks/useParams";
 import { AttachmentEdit } from "./AttachmentEdit";
 
 export const AttachmentListEdit = ({
   ids = useParams() as Params,
-  elements = FileAttachmentApi.useGetList(ids),
+  elements = AttachmentApi.useGetList(ids),
   selection: [selection, setSelection] = useState<string[]>([]),
   onCreateAttachment = useCreateBlankAttachment({ AttachIds: ids }),
-  onDeleteAttachmentList = FileAttachmentApi.useDeleteList(),
+  onDeleteAttachmentList = AttachmentApi.useDeleteList(),
 }) => (
   <StyledView column>
     <UnstyledList

package/src/{FileAttachment → Attachment}/AttachmentListView.tsx

@@ -2,11 +2,11 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-import { FileAttachmentApi } from "../hooks/FileAttachmentApi";
+import { AttachmentApi } from "../hooks/AttachmentApi";
 import { useParams } from "../hooks/useParams";
 import { AttachmentView } from "./AttachmentView";
 
 export const AttachmentListView = ({
   ids = useParams(),
-  attachments = FileAttachmentApi.useGetList(ids),
+  attachments = AttachmentApi.useGetList(ids),
 }) => attachments?.map((a) => <AttachmentView key={a.id} id={a.id} />);

package/src/{FileAttachment → Attachment}/AttachmentView.tsx

@@ -4,11 +4,12 @@
 
 import { useIdStringParam } from "@dwidge/hooks-expo";
 import { FileView } from "@dwidge/components-expo";
-import { FileAttachmentApi } from "../hooks/FileAttachmentApi";
+import { AttachmentApi } from "../hooks/AttachmentApi";
 import { FileApi } from "../hooks/FileApi";
+import { filterId } from "../hooks/useIdFilter";
 
 export const AttachmentView = ({
   id = useIdStringParam(),
-  attachment: [attachment] = FileAttachmentApi.useItem(id),
-  file: [file, setFile] = FileApi.useItem(attachment?.FileId),
+  attachment: [attachment] = AttachmentApi.useItem(filterId(id)),
+  file: [file, setFile] = FileApi.useItem(filterId(attachment?.FileId)),
 }) => <FileView file={[file, setFile]} />;

package/src/Attachment/index.ts

@@ -0,0 +1,7 @@
+export * from "./AttachmentEdit.js";
+export * from "./AttachmentListEdit.js";
+export * from "./AttachmentListView.js";
+export * from "./AttachmentScreen.js";
+export * from "./AttachmentView.js";
+export * from "./useFileAttachmentUrl.js";
+export * from "./useFileUrl.js";

package/src/{FileAttachment → Attachment}/useFileAttachmentUrl.ts

@@ -3,13 +3,14 @@
 // https://www.boost.org/LICENSE_1_0.txt
 
 import { FileApi } from "../hooks/FileApi";
-import { FileAttachmentApi } from "../hooks/FileAttachmentApi";
+import { AttachmentApi } from "../hooks/AttachmentApi";
+import { filterId } from "../hooks/useIdFilter";
 
 export const useFileAttachmentUrl = (
   attachmentId?: string,
 ): string | null | undefined => useFileAttachmentUrlInternal(attachmentId);
 const useFileAttachmentUrlInternal = (
   attachmentId?: string,
-  attachment = FileAttachmentApi.useGetItem(attachmentId),
-  file = FileApi.useGetItem(attachment?.FileId),
+  attachment = AttachmentApi.useGetItem(filterId(attachmentId)),
+  file = FileApi.useGetItem(filterId(attachment?.FileId)),
 ) => file?.getUrl;

package/src/{FileAttachment → Attachment}/useFileUrl.ts

@@ -3,10 +3,11 @@
 // https://www.boost.org/LICENSE_1_0.txt
 
 import { FileApi } from "../hooks/FileApi";
+import { filterId } from "../hooks/useIdFilter";
 
 export const useFileUrl = (fileId?: string): string | null | undefined =>
   useFileUrlInternal(fileId);
 const useFileUrlInternal = (
   fileId?: string,
-  file = FileApi.useGetItem(fileId),
+  file = FileApi.useGetItem(filterId(fileId)),
 ) => file?.getUrl;

package/src/Form/FormEdit.tsx

@@ -2,14 +2,67 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-import { StyledLoader, StyledText, StyledView } from "@dwidge/components-rnw";
+import { StyledButton, StyledLoader, StyledText } from "@dwidge/components-rnw";
+import { useNavAction2 } from "@dwidge/hooks-expo";
+import {
+  defaultFormSchemaString,
+  defaultJsonFormDataString,
+  FormSubmit,
+} from "@dwidge/json-forms-designer";
+import { useContext } from "react";
+import { AttachmentListEdit } from "../Attachment/AttachmentListEdit";
+import { filterId } from "../hooks";
 import { FormApi } from "../hooks/FormApi";
+import { FormsContext } from "../hooks/FormsContext";
+import { SchemaApi } from "../hooks/SchemaApi";
+import { useParams } from "../hooks/useParams";
 
-export const FormCard = ({ form = FormApi.useGetItem() }) =>
-  form ? (
-    <StyledView flex card row>
-      <StyledText>{form.name ?? "untitled"}</StyledText>
-    </StyledView>
-  ) : (
+export const FormEdit = ({
+  id = useParams().FormId,
+  form: [form, setForm] = FormApi.useItem(filterId(id)),
+  schema = SchemaApi.useGetItem(filterId(form?.SchemaId)),
+  onEditSchema = useNavAction2(
+    useContext(FormsContext).routes.SCHEMA_EDIT_SCREEN,
+    async (SchemaId: string) => ({
+      SchemaId,
+    }),
+  ),
+  onSaveForm = useNavAction2(
+    useContext(FormsContext).routes.FORM_LIST_SCREEN,
+    async () => ({}),
+  ),
+}) =>
+  form === undefined || schema === undefined ? (
     <StyledLoader />
+  ) : form === null || schema === null ? (
+    <StyledText>No form</StyledText>
+  ) : schema.schema ? (
+    <>
+      <FormSubmit
+        dataString={[
+          form.data ?? defaultJsonFormDataString,
+          setForm &&
+            ((data) =>
+              setForm((prev) => ({
+                ...prev,
+                data:
+                  typeof data === "function"
+                    ? data(prev?.data ?? defaultJsonFormDataString)
+                    : data,
+              }))),
+        ]}
+        schemaString={[schema.schema ?? defaultFormSchemaString]}
+      />
+      <AttachmentListEdit ids={{ FormId: form.id }} />
+      <StyledButton onPress={onSaveForm}>Save</StyledButton>
+    </>
+  ) : (
+    <>
+      <StyledText>This form design has not been created yet.</StyledText>
+      {onEditSchema && (
+        <StyledButton onPress={() => onEditSchema(schema.id!)}>
+          Edit Form Design
+        </StyledButton>
+      )}
+    </>
   );

package/src/Form/FormEditScreen.tsx

@@ -3,52 +3,20 @@
 // https://www.boost.org/LICENSE_1_0.txt
 
 import { StyledHeader } from "@dwidge/components-expo";
-import {
-  CenterView,
-  ScreenView,
-  ScrollView,
-  StyledText,
-} from "@dwidge/components-rnw";
-import {
-  defaultFormSchemaString,
-  FormDesigner,
-  FormSchema,
-} from "@dwidge/json-forms-designer";
+import { ScreenView, ScrollView } from "@dwidge/components-rnw";
+import { SchemaApi } from "../hooks/SchemaApi";
 import { FormApi } from "../hooks/FormApi";
-import { useParams } from "../hooks/useParams";
+import { FormEdit } from "./FormEdit";
+import { filterId, useParams } from "../hooks";
 
 export const FormEditScreen = ({
-  form: [form, setForm] = FormApi.useItem(useParams().FormId),
+  form = FormApi.useGetItem(filterId(useParams().FormId)),
+  schema = SchemaApi.useGetItem(filterId(form?.SchemaId)),
 }) => (
   <ScreenView>
-    <StyledHeader title={["Form", form?.name].filter(Boolean).join(" - ")} />
-    {form == null || !form ? (
-      <CenterView>
-        <StyledText>
-          {form === null ? "The form does not exist." : "Loading..."}
-        </StyledText>
-      </CenterView>
-    ) : (
-      <ScrollView flex gap wide pad selfcenter>
-        <FormDesigner
-          schemaString={[
-            form.schema ?? defaultFormSchemaString,
-            setForm &&
-              ((updater) => {
-                const next =
-                  typeof updater === "function"
-                    ? updater(form.schema ?? defaultFormSchemaString)
-                    : updater;
-                const parsed = FormSchema.parse(JSON.parse(next));
-                setForm?.((prev) => ({
-                  ...prev,
-                  name: parsed.schema.title,
-                  schema: next,
-                }));
-              }),
-          ]}
-        />
-      </ScrollView>
-    )}
+    <StyledHeader title={["Form", schema?.name].filter(Boolean).join(" - ")} />
+    <ScrollView flex gap pad>
+      <FormEdit />
+    </ScrollView>
   </ScreenView>
 );

package/src/Form/FormListEdit.tsx

@@ -2,17 +2,23 @@
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-import { UnstyledList, viewStyles } from "@dwidge/components-rnw";
+import { StyledView, UnstyledList, viewStyles } from "@dwidge/components-rnw";
 import { useNavAction2 } from "@dwidge/hooks-expo";
+import { useMemoState } from "@dwidge/hooks-react";
 import assert from "assert";
-import { useState } from "react";
+import { useParams } from "../hooks";
 import { FormApi } from "../hooks/FormApi";
 import { useNavRoutes } from "../hooks/FormsContext";
-import { FormCard } from "./FormEdit";
+import { FormView } from "./FormView";
 
 export const FormListEdit = ({
-  elements = FormApi.useGetList(),
-  selection: [selection, setSelection] = useState<string[]>([]),
+  ids = useParams(),
+  items = FormApi.useGetList({
+    // id: undefined,
+    // data: undefined,
+    // ...ids,
+  }),
+  selection: [selection, setSelection] = useMemoState<string[]>([]),
   onPress = useNavAction2(
     useNavRoutes().FORM_EDIT_SCREEN,
     async (id: string) => ({
@@ -20,13 +26,15 @@ export const FormListEdit = ({
     }),
   ),
 }) => (
-  <UnstyledList
-    items={elements}
-    keyExtractor={(item) => (assert(item.id), item.id)}
-    selection={[selection, setSelection]}
-    render={(item) => <FormCard form={item} />}
-    selectStyle={viewStyles.select}
-    style={viewStyles.unselect}
-    onPress={onPress}
-  />
+  <StyledView column>
+    <UnstyledList
+      items={items}
+      keyExtractor={(item) => (assert(item.id), item.id)}
+      selection={[selection, setSelection]}
+      render={(item) => <FormView id={item.id} />}
+      selectStyle={viewStyles.select}
+      style={viewStyles.unselect}
+      onPress={onPress}
+    />
+  </StyledView>
 );

package/src/Form/FormListScreen.tsx

@@ -8,47 +8,52 @@ import {
   ScreenView,
   ScrollView,
   StyledFontAwesome,
-  StyledView,
 } from "@dwidge/components-rnw";
+import { useNavAction2 } from "@dwidge/hooks-expo";
 import { useMemoState } from "@dwidge/hooks-react";
 import { TouchableOpacity } from "react-native";
 import { FormApi } from "../hooks/FormApi";
+import { useNavRoutes } from "../hooks/FormsContext";
 import { FormListEdit } from "./FormListEdit";
-import { useCreateBlankForm } from "../hooks/useCreateBlankForm";
 
 export const FormListScreen = ({
-  onCreate = useCreateBlankForm(),
-  onDeleteList = FormApi.useDeleteList(),
+  createForm = useNavAction2(
+    useNavRoutes().SCHEMA_SELECT_SCREEN,
+    async () => ({}),
+  ),
+  editForm = useNavAction2(
+    useNavRoutes().FORM_EDIT_SCREEN,
+    async (key: string) => ({
+      FormId: key,
+    }),
+  ),
+  deleteFormList = FormApi.useDeleteList(),
   selection = useMemoState<string[]>([]),
 }) => (
   <ScreenView>
     <StyledHeader
-      title="Forms"
+      title="Manage Forms"
       actions={[
         {
           icon: "remove-circle",
           onPress:
-            onDeleteList && selection[0].length
-              ? () => onDeleteList(selection[0].map((id) => ({ id })))
+            deleteFormList && selection[0].length
+              ? () => deleteFormList(selection[0].map((id) => ({ id })))
               : undefined,
         },
         {
           icon: "add-circle",
-          onPress: onCreate,
+          onPress: createForm,
         },
       ]}
     />
-    <ScrollView gap pad>
-      <StyledView flex column>
-        <StyledView>
-          <FormListEdit selection={selection} />
-        </StyledView>
-        <TouchableOpacity style={{ flex: 1 }} onPress={onCreate}>
-          <CenterView row gap>
-            <StyledFontAwesome name="plus" size={30} />
-          </CenterView>
-        </TouchableOpacity>
-      </StyledView>
+    <ScrollView gap>
+      <FormListEdit selection={selection} onPress={editForm} />
+      <TouchableOpacity style={{ flex: 1 }} onPress={createForm}>
+        <CenterView row gap>
+          <StyledFontAwesome name="plus" size={30} />
+        </CenterView>
+      </TouchableOpacity>
     </ScrollView>
   </ScreenView>
 );