diff --git a/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte b/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte index d49b796e5a..d87b07493d 100644 --- a/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte +++ b/mathesar_ui/src/component-library/checkbox-group/CheckboxGroup.svelte @@ -25,6 +25,7 @@ optionToCompare: Option | undefined, selectedOption: Option | undefined, ) => boolean = (a, b) => a === b; + export let disabled = false; function handleChange(option: Option, checked: boolean) { @@ -42,7 +43,7 @@ {label} {disabled} let:option - let:disabled + let:disabled={innerDisabled} on:change labelKey={checkboxLabelKey} getLabel={getCheckboxLabel} @@ -50,7 +51,7 @@ handleChange(option, checked)} checked={values.some((o) => valuesAreEqual(o, option))} - {disabled} + disabled={innerDisabled} /> diff --git a/mathesar_ui/src/component-library/dropdown/Dropdown.svelte b/mathesar_ui/src/component-library/dropdown/Dropdown.svelte index d9cf38bb83..e313b05aac 100644 --- a/mathesar_ui/src/component-library/dropdown/Dropdown.svelte +++ b/mathesar_ui/src/component-library/dropdown/Dropdown.svelte @@ -91,7 +91,7 @@ on:close={close} on:open on:close - let:close + let:close={innerClose} > - + diff --git a/mathesar_ui/src/component-library/radio-group/RadioGroup.svelte b/mathesar_ui/src/component-library/radio-group/RadioGroup.svelte index 1727220278..c73db49383 100644 --- a/mathesar_ui/src/component-library/radio-group/RadioGroup.svelte +++ b/mathesar_ui/src/component-library/radio-group/RadioGroup.svelte @@ -39,13 +39,13 @@ {disabled} {boxed} let:option - let:disabled + let:disabled={innerDisabled} on:change labelKey={radioLabelKey} getLabel={getRadioLabel} > { if (checked) { diff --git a/mathesar_ui/src/component-library/toast/ToastItem.svelte b/mathesar_ui/src/component-library/toast/ToastItem.svelte index e1da6c713c..2dc7e8561f 100644 --- a/mathesar_ui/src/component-library/toast/ToastItem.svelte +++ b/mathesar_ui/src/component-library/toast/ToastItem.svelte @@ -23,9 +23,9 @@ $: readableTextColor = ensureReadable(props.textColor); $: readableProgressColor = ensureReadable(props.progressColor); $: style = ` - --toast-item-background-color: ${$readableBackgroundColor as string}; - --toast-item-text-color: ${$readableTextColor as string}; - --toast-item-progress-color: ${$readableProgressColor as string}; + --toast-item-background-color: ${$readableBackgroundColor}; + --toast-item-text-color: ${$readableTextColor}; + --toast-item-progress-color: ${$readableProgressColor}; `; diff --git a/mathesar_ui/src/components/EditableTextWithActions.svelte b/mathesar_ui/src/components/EditableTextWithActions.svelte index dfe56beb1e..ba7ac2ab85 100644 --- a/mathesar_ui/src/components/EditableTextWithActions.svelte +++ b/mathesar_ui/src/components/EditableTextWithActions.svelte @@ -1,8 +1,8 @@ - +--> + {@html displayRecordSummaryAsHtml(recordSummary)} diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeDBOptions.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeDBOptions.svelte index 6f0edab326..5fddd952ac 100644 --- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeDBOptions.svelte +++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeDBOptions.svelte @@ -18,8 +18,6 @@ export let typeOptions: ColumnWithAbstractType['type_options']; export let column: ColumnWithAbstractType; - let dbFormHasError = false; - $: ({ dbOptionsConfig, dbForm, dbFormValues } = constructDbForm( selectedAbstractType, selectedDbType, @@ -31,7 +29,6 @@ let isValid = true; if (dbForm) { const isDbFormValid = dbForm.getValidationResult().isValid; - dbFormHasError = !isDbFormValid; isValid = isValid && isDbFormValid; } return isValid; diff --git a/mathesar_ui/src/components/abstract-type-control/AbstractTypeDisplayOptions.svelte b/mathesar_ui/src/components/abstract-type-control/AbstractTypeDisplayOptions.svelte index e18673c1f3..1849ee6ec0 100644 --- a/mathesar_ui/src/components/abstract-type-control/AbstractTypeDisplayOptions.svelte +++ b/mathesar_ui/src/components/abstract-type-control/AbstractTypeDisplayOptions.svelte @@ -17,14 +17,11 @@ export let displayFormValues: Readable; export let disabled = false; - let displayFormHasError = false; - const validationContext = getValidationContext(); validationContext.addValidator('AbstractTypeConfigValidator', () => { let isValid = true; if (displayForm) { const isDisplayFormValid = displayForm.getValidationResult().isValid; - displayFormHasError = !isDisplayFormValid; isValid = isValid && isDisplayFormValid; } return isValid; diff --git a/mathesar_ui/src/components/rich-text/RichText.svelte b/mathesar_ui/src/components/rich-text/RichText.svelte index 4e30f9fccf..058713b1e6 100644 --- a/mathesar_ui/src/components/rich-text/RichText.svelte +++ b/mathesar_ui/src/components/rich-text/RichText.svelte @@ -1,9 +1,9 @@ - +-->
- {#each Array(numTables) as _, index (index)} + {#each skeletons as _ (_)}
diff --git a/mathesar_ui/src/routes/RootRoute.svelte b/mathesar_ui/src/routes/RootRoute.svelte index 4f72fcddc1..8a3dbf8d7b 100644 --- a/mathesar_ui/src/routes/RootRoute.svelte +++ b/mathesar_ui/src/routes/RootRoute.svelte @@ -9,7 +9,7 @@ export let commonData: CommonData; - diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte index 9e8bc8b224..2136ddcce1 100644 --- a/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte +++ b/mathesar_ui/src/systems/data-explorer/result-pane/QueryRunErrors.svelte @@ -18,7 +18,7 @@ function deleteMissingColumns(column_id: number) { if (queryManager) { - queryManager.update((q) => q.withoutColumnsById([column_id])); + void queryManager.update((q) => q.withoutColumnsById([column_id])); } } diff --git a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte index 9703ad41a9..c72e4bf9c0 100644 --- a/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte +++ b/mathesar_ui/src/systems/data-explorer/result-pane/Results.svelte @@ -122,10 +122,10 @@ columnIdentifierKey={ID_ROW_CONTROL_COLUMN} isStatic isControlCell - let:htmlAttributes + let:htmlAttributes={sheetCellHtmlAttributes} let:style > -
+
{$pagination.offset + item.index + 1}
diff --git a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte index 567a354d0f..55398549a9 100644 --- a/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte +++ b/mathesar_ui/src/systems/record-selector/RecordSelectorTable.svelte @@ -233,7 +233,7 @@ {overflowDetails} /> {#each [...$processedColumns] as [columnId, processedColumn] (columnId)} - {@const column = processedColumn.column} + {@const { column } = processedColumn} { - recordsData.addEmptyRecord(); + void recordsData.addEmptyRecord(); selection.selectAndActivateFirstDataEntryCellInLastRow(); }} > diff --git a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte index 3047ffc6bb..08b07b64ce 100644 --- a/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte +++ b/mathesar_ui/src/systems/table-view/constraints/ForeignKeyConstraintDetails.svelte @@ -43,12 +43,12 @@ {#await getReferentColumns(constraint)} {:then referentColumns} - {#each referentColumns as referentColumn, index (referentColumn.id)} + {#each referentColumns as referentColumn (referentColumn.id)} {/each} - {:catch error} + {:catch} {/await}
diff --git a/mathesar_ui/src/systems/table-view/header/drag-and-drop/Droppable.svelte b/mathesar_ui/src/systems/table-view/header/drag-and-drop/Droppable.svelte index b978f2297a..1c30c68dde 100644 --- a/mathesar_ui/src/systems/table-view/header/drag-and-drop/Droppable.svelte +++ b/mathesar_ui/src/systems/table-view/header/drag-and-drop/Droppable.svelte @@ -10,6 +10,8 @@ $: draggedOverRight = columnLocationDifference < 0; $: draggedOverLeft = columnLocationDifference > 0; + let isDraggedOverCounter = 0; + // Needs to be a counter because dragEnter and dragLeave are fired for child elements function dragEnter(e: DragEvent) { e.preventDefault(); @@ -20,16 +22,9 @@ isDraggedOverCounter -= 1; } - function shouldReset( - locationOfFirstDraggedColumnParam: number | undefined, - ): number { - if (locationOfFirstDraggedColumnParam === undefined) { - return 0; - } - return isDraggedOverCounter; + $: if (locationOfFirstDraggedColumn === undefined) { + isDraggedOverCounter = 0; } - - $: isDraggedOverCounter = shouldReset(locationOfFirstDraggedColumn);
+-->