diff --git a/package.json b/package.json index bac65a273..3cc76cd37 100644 --- a/package.json +++ b/package.json @@ -24,9 +24,9 @@ "@ai-sdk/svelte": "^1.1.24", "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@964f807", "@appwrite.io/pink-icons": "0.25.0", - "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@1955660", + "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@e1c4a38", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed", + "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@e1c4a38", "@faker-js/faker": "^9.9.0", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2e6786cdd..236b0fae3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,14 +18,14 @@ importers: specifier: 0.25.0 version: 0.25.0 '@appwrite.io/pink-icons-svelte': - specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@1955660 - version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@1955660(svelte@5.38.7) + specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@e1c4a38 + version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@e1c4a38(svelte@5.38.7) '@appwrite.io/pink-legacy': specifier: ^1.0.3 version: 1.0.3 '@appwrite.io/pink-svelte': - specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed - version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed(svelte@5.38.7) + specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@e1c4a38 + version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@e1c4a38(svelte@5.38.7) '@faker-js/faker': specifier: ^9.9.0 version: 9.9.0 @@ -269,8 +269,8 @@ packages: peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@1955660': - resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@1955660} + '@appwrite.io/pink-icons-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@e1c4a38': + resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@e1c4a38} version: 2.0.0-RC.1 peerDependencies: svelte: ^4.0.0 @@ -284,8 +284,8 @@ packages: '@appwrite.io/pink-legacy@1.0.3': resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==} - '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed': - resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed} + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@e1c4a38': + resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@e1c4a38} version: 2.0.0-RC.2 peerDependencies: svelte: ^4.0.0 @@ -3596,7 +3596,7 @@ snapshots: dependencies: svelte: 5.38.7 - '@appwrite.io/pink-icons-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@1955660(svelte@5.38.7)': + '@appwrite.io/pink-icons-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@e1c4a38(svelte@5.38.7)': dependencies: svelte: 5.38.7 @@ -3609,7 +3609,7 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed(svelte@5.38.7)': + '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@e1c4a38(svelte@5.38.7)': dependencies: '@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.38.7) '@floating-ui/dom': 1.7.4 diff --git a/src/lib/elements/forms/inputLine.svelte b/src/lib/elements/forms/inputLine.svelte index 76b64f220..3987b3635 100644 --- a/src/lib/elements/forms/inputLine.svelte +++ b/src/lib/elements/forms/inputLine.svelte @@ -27,10 +27,6 @@ addLineButton }: Props = $props(); - function handlePointChange(pointIndex: number, coordIndex: number, newValue: number) { - onChangePoint?.(pointIndex, coordIndex, newValue); - } - function isDeleteDisabled(index: number) { let disable = index < minDeletableIndex; if (allowLineDelete !== undefined) { @@ -46,11 +42,11 @@ onDeletePoint(index)} onChangePoint={(coordIndex, newValue) => - handlePointChange(index, coordIndex, newValue)} /> + onChangePoint?.(index, coordIndex, newValue)} /> {/each} diff --git a/src/lib/elements/forms/inputPoint.svelte b/src/lib/elements/forms/inputPoint.svelte index bd83e7b1b..7f71eada4 100644 --- a/src/lib/elements/forms/inputPoint.svelte +++ b/src/lib/elements/forms/inputPoint.svelte @@ -29,7 +29,7 @@ {#if nullable} {#each nullableSkeletonShape as _, index} - + {/each} {:else} {#each values as _, index} @@ -46,7 +46,7 @@ size="s" secondary disabled={nullable || disableDelete} - on:click={onDeletePoint}> + on:click={() => onDeletePoint?.()}> {/if} diff --git a/src/lib/elements/forms/inputPolygon.svelte b/src/lib/elements/forms/inputPolygon.svelte index 9a37855b2..c2bcbb4db 100644 --- a/src/lib/elements/forms/inputPolygon.svelte +++ b/src/lib/elements/forms/inputPolygon.svelte @@ -2,11 +2,10 @@ import { Icon, Layout } from '@appwrite.io/pink-svelte'; import Button from './button.svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; - import type { NestedNumberArray } from '$lib/helpers/types'; import InputLine from './inputLine.svelte'; type Props = { - values: NestedNumberArray; + values: number[][][]; nullable?: boolean; minDeletableIndex?: number; onAddPoint: (index: number) => void; @@ -29,31 +28,18 @@ onDeletePoint, onChangePoint }: Props = $props(); - - function handlePointChange( - lineIndex: number, - pointIndex: number, - coordIndex: number, - newValue: number - ) { - onChangePoint?.(lineIndex, pointIndex, coordIndex, newValue); - } - - function handleAddLineInternal() { - onAddLine?.(-1); - } {#each values as value, index} onAddPoint(index)} {nullable} onDeletePoint={() => onDeletePoint(index)} onChangePoint={(pointIndex, coordIndex, newValue) => - handlePointChange(index, pointIndex, coordIndex, newValue)} + onChangePoint(index, pointIndex, coordIndex, newValue)} allowLineDelete={index < 2} {minDeletableIndex}> {#snippet addLineButton()} @@ -62,7 +48,7 @@ disabled={nullable} size="xs" compact - on:click={handleAddLineInternal}> + on:click={() => onAddLine?.(-1)}> Add line {/if} diff --git a/src/lib/helpers/types.ts b/src/lib/helpers/types.ts index df6fba0d9..f1a362777 100644 --- a/src/lib/helpers/types.ts +++ b/src/lib/helpers/types.ts @@ -80,5 +80,3 @@ export type TableRootProp = { addAvailableId: (id: string) => void; removeAvailableId: (id: string) => void; }; - -export type NestedNumberArray = Array; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/line.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/line.svelte index a9c2bb4cb..96444e102 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/line.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/line.svelte @@ -41,13 +41,13 @@ import { getDefaultSpatialData } from '../store'; interface Props { - data?: Partial; + data?: Partial; } let { data = { required: false, default: null } }: Props = $props(); let savedDefault = $state(data.default); - let defaultChecked = $state(data.default ? true : false); + let defaultChecked = $state(!!data.default); function handleDefaultState(hideDefault: boolean) { if (hideDefault) { @@ -58,7 +58,7 @@ } } - function pushCoordinate(_: number) { + function pushCoordinate() { data.default.push(getDefaultSpatialData('point') as number[]); } @@ -115,11 +115,12 @@ {/if} pushCoordinate()} onDeletePoint={deleteCoordinate} - onChangePoint={(pointIndex, coordIndex, newValue) => { - if (data.default && data.default[pointIndex]) { - data.default[pointIndex][coordIndex] = newValue; + onChangePoint={(index, newValue) => { + if (data.default) { + data.default[index] = newValue; + data.default = [...data.default]; } }} /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/point.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/point.svelte index b2c5909f4..db5cbf99b 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/point.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/point.svelte @@ -47,7 +47,7 @@ let { data = { required: false, default: null } }: Props = $props(); let savedDefault = $state(data.default); - let defaultChecked = $state(data.default ? true : false); + let defaultChecked = $state(!!data.default); function handleDefaultState(hideDefault: boolean) { if (hideDefault) { diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/polygon.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/polygon.svelte index 3ef93242f..b5c7fe62a 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/polygon.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/polygon.svelte @@ -7,7 +7,7 @@ databaseId: string, tableId: string, key: string, - data: Partial + data: Partial ) { await sdk.forProject(page.params.region, page.params.project).tablesDB.createPolygonColumn({ databaseId, @@ -20,7 +20,7 @@ export async function updatePolygon( databaseId: string, tableId: string, - data: Partial, + data: Partial, originalKey?: string ) { await sdk.forProject(page.params.region, page.params.project).tablesDB.updatePolygonColumn({ @@ -41,13 +41,13 @@ import { getDefaultSpatialData, getSingleRingPolygon } from '../store'; interface Props { - data?: Partial; + data?: Partial; } let { data = { required: false, default: null } }: Props = $props(); let savedDefault = $state(data.default); - let defaultChecked = $state(data.default ? true : false); + let defaultChecked = $state(!!data.default); function handleDefaultState(hideDefault: boolean) { if (hideDefault) { @@ -61,7 +61,7 @@ const { stores: { required }, listen - } = createConservative>({ + } = createConservative>({ required: false, ...data }); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/store.ts index 51a9ee9be..0a29d12ef 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/store.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/store.ts @@ -24,7 +24,7 @@ import { IconRelationship, IconText, IconToggle, - IconPinned, + IconPoint, IconLine, IconPolygon } from '@appwrite.io/pink-icons-svelte'; @@ -126,7 +126,7 @@ export const columnOptions: Option[] = [ type: 'point', create: submitPoint, update: updatePoint, - icon: IconPinned + icon: IconPoint }, { name: 'Line', diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/line.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/line.svelte index bfe9c12d7..b1d290798 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/line.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/line.svelte @@ -27,6 +27,7 @@ function handlePointChange(pointIndex: number, coordIndex: number, newValue: number) { if (value && value[pointIndex]) { value[pointIndex][coordIndex] = newValue; + value = [...value]; } } diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/point.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/point.svelte index 9b0d49e29..e5cf15683 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/point.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/columns/types/point.svelte @@ -18,6 +18,7 @@ function handlePointChange(index: number, newValue: number) { if (value) { value[index] = newValue; + value = [...value]; } } diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte index df1adfe46..b9fbf748d 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/spreadsheet.svelte @@ -70,7 +70,7 @@ IconLink, IconLocationMarker, IconMail, - IconPinned, + IconPoint, IconPlus, IconPolygon, IconRelationship, @@ -309,7 +309,7 @@ case 'relationship': return IconRelationship; case 'point': - return IconPinned; + return IconPoint; case 'linestring': return IconLine; case 'polygon':