@morscherlab/mint-sdk 1.3.9 → 1.4.0-beta.2

package/src/components/ExperimentPopover.story.vue

@@ -316,7 +316,7 @@ const STATUSES = ['planned', 'ongoing', 'completed', 'ready_to_extract', 'proces
           </div>
         </div>
         <p style="margin-top: 1rem; font-size: 0.75rem; color: var(--text-muted); text-align: center;">
-          Same 2.375rem height and refresh-design motion as the AppTopBar page selector and AppAvatarMenu.
+          Same 2.375rem height and refresh-design motion as the AppTopBar page selector.
         </p>
       </div>
     </Variant>

package/src/components/ExperimentPopover.vue

@@ -2,7 +2,7 @@
 /** Floating popover showing the active experiment with save, detach, and select actions. */
 import { ref, computed, watch, onUnmounted, useTemplateRef } from 'vue'
 import { useDropdownState } from '../composables/useDropdownState'
-import { formatExperimentStatus } from '../composables/experiment-utils'
+import { format as formatStatus } from '../utils/experimentStatus'
 import ConfirmDialog from './ConfirmDialog.vue'
 
 interface Props {
@@ -290,7 +290,7 @@ onUnmounted(() => {
             <span v-if="experimentCode" class="mint-experiment-popover__card-code">{{ experimentCode }}</span>
             <div class="mint-experiment-popover__card-name">{{ experimentName }}</div>
             <div v-if="experimentStatus" class="mint-experiment-popover__card-status">
-              {{ formatExperimentStatus(experimentStatus) }}
+              {{ formatStatus(experimentStatus) }}
             </div>
           </div>
         </div>
@@ -307,10 +307,10 @@ onUnmounted(() => {
 
     <!-- Save confirmation dialog -->
     <ConfirmDialog
-      v-model="showConfirm"
+      v-model:open="showConfirm"
       :title="confirmTitle ?? 'Save to Experiment'"
       :message="confirmMessage ?? `Save current data to ${experimentName}?`"
-      variant="info"
+      tone="info"
       confirm-label="Save"
       :loading="saveLoading"
       @confirm="handleConfirmSave"

package/src/components/ExperimentSelectorModal.story.vue

@@ -284,7 +284,7 @@ const selectedExperiment = computed(() => experimentStore.current)
           </div>
 
           <ExperimentSelectorModal
-            v-model="isOpen"
+            v-model:open="isOpen"
             :experiment-type="state.experimentType || undefined"
             :title="state.title"
             :current-experiment-id="selectedExperiment?.id ?? null"
@@ -312,7 +312,7 @@ const selectedExperiment = computed(() => experimentStore.current)
         </button>
 
         <ExperimentSelectorModal
-          v-model="isOpenAdvanced"
+          v-model:open="isOpenAdvanced"
           title="Select Experiment"
           :show-filters="true"
         />
@@ -332,7 +332,7 @@ const selectedExperiment = computed(() => experimentStore.current)
         </button>
 
         <ExperimentSelectorModal
-          v-model="isOpenGrouped"
+          v-model:open="isOpenGrouped"
           title="Select Experiment"
           :group-by-project="true"
         />
@@ -352,7 +352,7 @@ const selectedExperiment = computed(() => experimentStore.current)
         </button>
 
         <ExperimentSelectorModal
-          v-model="isOpenWithSelection"
+          v-model:open="isOpenWithSelection"
           title="Select Experiment"
           :current-experiment-id="1"
         />
@@ -372,7 +372,7 @@ const selectedExperiment = computed(() => experimentStore.current)
         </button>
 
         <ExperimentSelectorModal
-          v-model="isOpenEmpty"
+          v-model:open="isOpenEmpty"
           experiment-type="nonexistent_type"
           title="Select Experiment"
         />

package/src/components/ExperimentSelectorModal.vue

@@ -4,7 +4,7 @@
  *
  * @example Recommended
  * ```vue
- * <ExperimentSelectorModal v-model="open" :allowed-experiment-types="['mass-spectrometry']" />
+ * <ExperimentSelectorModal v-model:open="open" :allowed-experiment-types="['mass-spectrometry']" />
  * ```
  */
 import { ref, computed, watch } from 'vue'
@@ -13,18 +13,16 @@ import { useExperimentSelector } from '../composables/useExperimentSelector'
 import { useExperimentStore } from '../stores/experiment'
 import {
   formatExperimentDate,
-  formatExperimentStatus,
-  getExperimentStatusVariant,
-  EXPERIMENT_STATUS_OPTIONS,
   DATE_PRESET_OPTIONS,
   SORT_OPTIONS,
 } from '../composables/experiment-utils'
+import * as experimentStatus from '../utils/experimentStatus'
 import BaseModal from './BaseModal.vue'
 import BaseSelect from './BaseSelect.vue'
 import ResourcePickerListInternal from './internal/ResourcePickerListInternal.vue'
 
 interface Props {
-  modelValue: boolean
+  open: boolean
   experimentType?: string
   allowedExperimentTypes?: string[] | null
   currentExperimentId?: number | null
@@ -46,7 +44,7 @@ const props = withDefaults(defineProps<Props>(), {
 // A single owner of "the current experiment" is what stops callers holding —
 // or inventing — a record of their own.
 const emit = defineEmits<{
-  'update:modelValue': [value: boolean]
+  'update:open': [value: boolean]
 }>()
 
 const experimentStore = useExperimentStore()
@@ -108,7 +106,7 @@ function describe(experiment: ExperimentSummary) {
       owner ? [owner.first_name, owner.last_name].filter(Boolean).join(' ') || owner.username : '',
     ].filter(Boolean),
     status: experiment.status
-      ? { label: formatExperimentStatus(experiment.status), variant: getExperimentStatusVariant(experiment.status) }
+      ? { label: experimentStatus.format(experiment.status), tone: experimentStatus.tone(experiment.status) }
       : undefined,
     date: formatExperimentDate(experiment.created_at),
   }
@@ -124,17 +122,17 @@ function handleSortChange(value: string | number) {
 
 function handleSelect(experiment: ExperimentSummary) {
   experimentStore.select(experiment)
-  emit('update:modelValue', false)
+  emit('update:open', false)
 }
 
 function handleDeselect() {
   experimentStore.clear()
-  emit('update:modelValue', false)
+  emit('update:open', false)
 }
 
 // Fetch on open
 watch(
-  () => props.modelValue,
+  () => props.open,
   (isOpen) => {
     if (isOpen) {
       openCount.value++
@@ -148,10 +146,10 @@ watch(
 
 <template>
   <BaseModal
-    :model-value="modelValue"
+    :open="open"
     :title="title"
     :size="size"
-    @update:model-value="emit('update:modelValue', $event)"
+    @update:open="emit('update:open', $event)"
   >
     <ResourcePickerListInternal
       :key="openCount"
@@ -174,7 +172,7 @@ watch(
         <div class="mint-experiment-selector__filter-select">
           <BaseSelect
             :model-value="filters.status ?? ''"
-            :options="EXPERIMENT_STATUS_OPTIONS"
+            :options="experimentStatus.OPTIONS"
             size="sm"
             aria-label="Filter by status"
             @update:model-value="v => setFilter('status', v)"

package/src/components/FilePicker.vue

@@ -145,7 +145,7 @@ const summary = computed(() => {
 </script>
 
 <template>
-  <BaseModal :model-value="open" size="xl" layout="plain" @close="cancel">
+  <BaseModal :open="open" size="xl" layout="plain" @close="cancel">
     <template #header>
       <div class="mint-picker__head" @keydown="keyboard">
         <h2 class="mint-picker__title">{{ title }}</h2>

package/src/components/FormBuilder.story.vue

@@ -94,9 +94,16 @@ const compactControls = defineControls({
   },
 })
 
+const compactModel = defineControlModel({ controls: compactControls })
+
 const modelValues = ref<Record<string, unknown>>({})
 const controlValues = ref<Record<string, unknown>>({})
 
+/** The analysis model with or without the submit / cancel bar. */
+function analysisSpec(actions: boolean) {
+  return { ...analysisModel, controlOptions: { ...analysisModel.controlOptions, actions } }
+}
+
 function initState() {
   return {
     size: 'md' as FormSize,
@@ -115,9 +122,8 @@ function initState() {
           <div class="form-builder-story__surface">
             <FormBuilder
               v-model="modelValues"
-              :model="analysisModel"
+              :spec="analysisSpec(state.showActions)"
               :size="state.size"
-              :show-actions="state.showActions"
               :readonly="state.readonly"
               :disabled="state.disabled"
             />
@@ -147,8 +153,7 @@ function initState() {
         <div class="form-builder-story__surface form-builder-story__surface--narrow">
           <FormBuilder
             v-model="controlValues"
-            :controls="compactControls"
-            :show-actions="false"
+            :spec="compactModel"
           />
         </div>
         <pre class="form-builder-story__values">{{ JSON.stringify(controlValues, null, 2) }}</pre>

package/src/components/FormBuilder.vue

@@ -1,17 +1,11 @@
 <script setup lang="ts">
 /**
- * Schema-driven form component that renders flat or multi-step wizard forms.
+ * Generated form for a control model built with `defineControlModel()`.
  *
- * Pass a `FormSchema` with either `sections` (flat) or `steps` (wizard), or
- * pass a compact `controls` schema for standard generated forms.
- * Use `v-model` for two-way binding of the form data; the `submit` event
- * carries only the data for currently-visible fields. Supply `enhancements`
- * for dynamic options, custom validators, a submit handler, and field-change
- * callbacks that cannot be expressed in JSON.
- * Compact control schemas can be bound directly:
- * `<FormBuilder :controls="controls" v-model="values" />`.
- * Complete control models can also be bound directly:
- * `<FormBuilder :model="workspaceModel" v-model="values" />`.
+ * The control model holds the controls, sections, columns, the submit / cancel
+ * bar (`actions`) and `enhancements` (dynamic options, validators, a submit
+ * handler and field callbacks). Bind the values with `v-model`; the `submit`
+ * event carries only the values of the visible fields.
  *
  * Exposes `form`, `validate`, `reset`, `updateSchema`, `goNext`, `goBack`,
  * `goToStep`, and `builder` for imperative control via template refs.
@@ -20,62 +14,39 @@
  * - `field:<name>` — override a single field's input component
  * - `section:<id>` — replace an entire section body
  * - `section:<id>:after` — inject content after a section
- * - `actions` — replace the default FormActions bar when `showActions` is true
+ * - `actions` — replace the default action bar when the model sets `actions`
  *
  * @example Recommended
  * ```vue
- * <FormBuilder v-model="values" :model="formModel" />
+ * <FormBuilder v-model="values" :spec="formModel" />
  * ```
  */
-import { ref, computed, watch } from 'vue'
-import type { FormSchema, FormEnhancements, UseFormBuilderReturn } from '../types/form-builder'
-import type { WizardStep } from '../types'
+import { computed, ref } from 'vue'
+import type { FormSchema } from '../types/form-builder'
 import {
   controlsToFormSchema,
   getControlDefaults,
-  mergeControlWorkspaceOptions,
-  resolveControlModel,
-  type ControlModel,
   type ControlModelBinding,
-  type ControlSchema,
-  type ControlWorkspaceOptions,
 } from '../composables/useControlSchema'
-import { useFormBuilder } from '../composables/useFormBuilder'
-import {
-  formSchemaFieldNames,
-  pickExistingRecordKeys,
-  recordValuesEqualForKeys,
-} from '../utils/formModelSync'
-import StepWizard from './StepWizard.vue'
-import FormSectionRenderer from './internal/FormSectionRenderer.vue'
-import FormActions from './FormActions.vue'
+import FormSchemaInternal from './internal/FormSchemaInternal.vue'
 
 interface Props {
-  /** Full form or wizard schema. Takes precedence when `controls` is also provided. */
-  schema?: FormSchema
-  /** Model returned by defineControlModel(), or a raw nested ControlModel for one-step form generation. */
-  model?: ControlModel | ControlModelBinding
-  /** Compact control schema used to generate a flat FormSchema. */
-  controls?: ControlSchema
-  /** Options passed to compact control schema generation, including shared initialValues. */
-  controlOptions?: ControlWorkspaceOptions
+  /** Control model built with defineControlModel(). Optional: without it the form is empty. */
+  spec?: ControlModelBinding
   modelValue?: Record<string, unknown>
-  enhancements?: FormEnhancements<Record<string, unknown>>
   loading?: boolean
   disabled?: boolean
   size?: 'sm' | 'md' | 'lg'
   readonly?: boolean
-  /** Show the default or slotted form actions. */
-  showActions?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  model: undefined,
-  controlOptions: () => ({}),
+  spec: undefined,
+  modelValue: undefined,
   loading: false,
   disabled: false,
+  size: undefined,
   readonly: false,
-  showActions: true,
 })
 
 const emit = defineEmits<{
@@ -84,224 +55,46 @@ const emit = defineEmits<{
   cancel: []
 }>()
 
-const resolvedModel = computed<ControlModelBinding | undefined>(() => {
-  return resolveControlModel(props.model)
-})
-
-const resolvedControls = computed<ControlSchema | undefined>(() =>
-  props.controls ?? resolvedModel.value?.controls,
-)
-
-const resolvedControlOptions = computed<ControlWorkspaceOptions>(() =>
-  mergeControlWorkspaceOptions(resolvedModel.value?.controlOptions ?? {}, props.controlOptions)
+const schema = computed<FormSchema>(() =>
+  props.spec ? controlsToFormSchema(props.spec.controls, props.spec.controlOptions) : { sections: [] },
 )
 
-const resolvedSchema = computed<FormSchema>(() => {
-  if (props.schema) return props.schema
-  if (resolvedControls.value) return controlsToFormSchema(resolvedControls.value, resolvedControlOptions.value)
-  return { sections: [] }
-})
-
-const resolvedModelValue = computed<Record<string, unknown>>(() => ({
-  ...(resolvedControls.value ? getControlDefaults(resolvedControls.value) : {}),
-  ...(resolvedControlOptions.value.initialValues ?? {}),
-  ...(props.modelValue ?? {}),
+const defaults = computed<Record<string, unknown>>(() => ({
+  ...(props.spec ? getControlDefaults(props.spec.controls) : {}),
+  ...(props.spec?.controlOptions.initialValues ?? {}),
 }))
 
-const builder = useFormBuilder(
-  resolvedSchema.value,
-  resolvedModelValue.value,
-  props.enhancements,
-)
-
-// Sync schema/control changes into the internal builder so generated forms stay coherent.
-watch(
-  resolvedSchema,
-  (schema) => {
-    const fieldNames = formSchemaFieldNames(schema)
-    const schemaValues = pickExistingRecordKeys(resolvedModelValue.value, fieldNames)
-    const existingValues = pickExistingRecordKeys(
-      builder.form.data as Record<string, unknown>,
-      fieldNames,
-    )
-    const nextValues = props.modelValue === undefined
-      ? { ...schemaValues, ...existingValues }
-      : schemaValues
-
-    builder.updateSchema(schema, nextValues)
-  },
-  { deep: true },
-)
-
-// Sync external modelValue changes into the internal form without resetting on no-op echo updates.
-watch(
-  () => props.modelValue,
-  () => {
-    const data = resolvedModelValue.value
-    const fieldNames = builderFieldNames()
-    if (recordValuesEqualForKeys(data, builder.form.data as Record<string, unknown>, fieldNames)) return
-    builder.reset(pickExistingRecordKeys(data, fieldNames))
-  },
-  { deep: true },
-)
-
-// Sync modelValue changes back to parent
-watch(
-  () => ({ ...builder.form.data }),
-  (data) => emit('update:modelValue', data as Record<string, unknown>),
-  { deep: true },
-)
-
-// Wizard support
-const isWizard = computed(() => !!resolvedSchema.value.steps)
-const wizardRef = ref<InstanceType<typeof StepWizard> | null>(null)
-
-const wizardSteps = computed<WizardStep[]>(() => {
-  if (!resolvedSchema.value.steps) return []
-  return resolvedSchema.value.steps.map((step) => ({
-    id: step.id,
-    label: step.label,
-    description: step.description,
-    icon: step.icon,
-    optional: step.optional,
-  }))
-})
-
-// Sync step validation state with StepWizard
-watch(
-  () => builder.isCurrentStepValid.value,
-  (valid) => {
-    wizardRef.value?.setStepValid(builder.currentStep.value, valid)
-  },
-)
-
-function handleNext() {
-  const success = builder.goNext()
-  if (success) {
-    wizardRef.value?.setStepValid(builder.currentStep.value - 1, true)
-  }
-}
-
-async function handleSubmit() {
-  await builder.submit()
-  const formData = builder.form.data as Record<string, unknown>
-  const visibleData = Object.fromEntries(
-    builder.fields
-      .filter((f) => builder.isFieldVisible(f.name))
-      .map((f) => [f.name, formData[f.name]]),
-  )
-  emit('submit', visibleData)
-}
-
-function handleCancel() {
-  emit('cancel')
-}
-
-function builderFieldNames(): string[] {
-  return builder.fields.map(field => field.name)
-}
+const inner = ref<InstanceType<typeof FormSchemaInternal> | null>(null)
 
 defineExpose({
-  form: builder.form,
-  validate: builder.validate,
-  reset: builder.reset,
-  updateSchema: builder.updateSchema,
-  goNext: builder.goNext,
-  goBack: builder.goBack,
-  goToStep: builder.goToStep,
-  builder,
+  get form() { return inner.value?.form },
+  get builder() { return inner.value?.builder },
+  validate: () => inner.value?.validate(),
+  reset: (...args: Parameters<InstanceType<typeof FormSchemaInternal>['reset']>) => inner.value?.reset(...args),
+  updateSchema: (...args: Parameters<InstanceType<typeof FormSchemaInternal>['updateSchema']>) => inner.value?.updateSchema(...args),
+  goNext: () => inner.value?.goNext(),
+  goBack: () => inner.value?.goBack(),
+  goToStep: (step: number) => inner.value?.goToStep(step),
 })
 </script>
 
 <template>
-  <div :class="['mint-form-builder', size ? `mint-form-builder--${size}` : '']">
-    <!-- Wizard mode -->
-    <template v-if="isWizard && resolvedSchema.steps">
-      <StepWizard
-        ref="wizardRef"
-        :steps="wizardSteps"
-        :model-value="builder.currentStep.value"
-        @update:model-value="builder.goToStep($event)"
-      >
-        <template v-for="step in resolvedSchema.steps" :key="step.id" #[`step-${step.id}`]>
-          <div class="mint-form-builder__step">
-            <template v-for="section in step.sections" :key="section.id">
-              <FormSectionRenderer
-                v-if="builder.isSectionVisible(section.id)"
-                :section="section"
-                :builder="(builder as UseFormBuilderReturn<Record<string, unknown>>)"
-              >
-                <!-- Forward field slots -->
-                <template v-for="field in section.fields" :key="field.name" #[`field:${field.name}`]="slotProps">
-                  <slot :name="`field:${field.name}`" v-bind="slotProps" />
-                </template>
-                <!-- Forward section slots -->
-                <template #[`section:${section.id}`]="slotProps">
-                  <slot :name="`section:${section.id}`" v-bind="slotProps" />
-                </template>
-                <template #[`section:${section.id}:after`]="slotProps">
-                  <slot :name="`section:${section.id}:after`" v-bind="slotProps" />
-                </template>
-              </FormSectionRenderer>
-            </template>
-          </div>
-        </template>
-
-        <template v-if="showActions" #navigation="{ isFirst, isLast }">
-          <slot name="actions" :form="builder.form" :builder="builder">
-            <FormActions
-              is-wizard
-              :is-first="isFirst"
-              :is-last="isLast"
-              :can-proceed="builder.isCurrentStepValid.value"
-              :loading="loading || builder.form.isSubmitting.value"
-              :disabled="disabled"
-              :submit-label="resolvedSchema.submitLabel ?? 'Submit'"
-              :cancel-label="resolvedSchema.cancelLabel ?? 'Cancel'"
-              :show-cancel="resolvedSchema.showCancel ?? false"
-              @next="handleNext"
-              @back="builder.goBack"
-              @submit="handleSubmit"
-              @cancel="handleCancel"
-            />
-          </slot>
-        </template>
-      </StepWizard>
-    </template>
-
-    <!-- Flat mode -->
-    <template v-else-if="resolvedSchema.sections">
-      <template v-for="section in resolvedSchema.sections" :key="section.id">
-        <FormSectionRenderer
-          v-if="builder.isSectionVisible(section.id)"
-          :section="section"
-          :builder="(builder as UseFormBuilderReturn<Record<string, unknown>>)"
-        >
-          <!-- Forward field slots -->
-          <template v-for="field in section.fields" :key="field.name" #[`field:${field.name}`]="slotProps">
-            <slot :name="`field:${field.name}`" v-bind="slotProps" />
-          </template>
-          <!-- Forward section slots -->
-          <template #[`section:${section.id}`]="slotProps">
-            <slot :name="`section:${section.id}`" v-bind="slotProps" />
-          </template>
-          <template #[`section:${section.id}:after`]="slotProps">
-            <slot :name="`section:${section.id}:after`" v-bind="slotProps" />
-          </template>
-        </FormSectionRenderer>
-      </template>
-
-      <slot v-if="showActions" name="actions" :form="builder.form" :builder="builder">
-        <FormActions
-          :loading="loading || builder.form.isSubmitting.value"
-          :disabled="disabled"
-          :submit-label="resolvedSchema.submitLabel ?? 'Submit'"
-          :cancel-label="resolvedSchema.cancelLabel ?? 'Cancel'"
-          :show-cancel="resolvedSchema.showCancel ?? false"
-          @submit="handleSubmit"
-          @cancel="handleCancel"
-        />
-      </slot>
+  <FormSchemaInternal
+    ref="inner"
+    :schema="schema"
+    :defaults="defaults"
+    :model-value="modelValue"
+    :enhancements="spec?.controlOptions.enhancements"
+    :loading="loading"
+    :disabled="disabled"
+    :size="size"
+    :readonly="readonly"
+    @update:model-value="emit('update:modelValue', $event)"
+    @submit="emit('submit', $event)"
+    @cancel="emit('cancel')"
+  >
+    <template v-for="(_, name) in $slots" #[name]="slotProps">
+      <slot :name="name" v-bind="slotProps ?? {}" />
     </template>
-  </div>
+  </FormSchemaInternal>
 </template>

package/src/components/FormField.story.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import FormField from './FormField.vue'
 import BaseInput from './BaseInput.vue'
-import BaseTextarea from './BaseTextarea.vue'
 </script>
 
 <template>
@@ -124,7 +123,7 @@ import BaseTextarea from './BaseTextarea.vue'
           <BaseInput model-value="Dose-response screen · Oncology" />
         </FormField>
         <FormField label="Notes" :show-optional="true" hint="Add any context future you will thank present you for.">
-          <BaseTextarea model-value="" placeholder="Anything worth remembering…" />
+          <BaseInput type="textarea" model-value="" placeholder="Anything worth remembering…" />
         </FormField>
       </div>
     </Variant>

package/src/components/FormulaInput.story.vue

@@ -16,7 +16,7 @@ const sizes: ('sm' | 'md' | 'lg')[] = ['sm', 'md', 'lg']
             :show-preview="state.showPreview"
             :show-m-w="state.showMW"
             :placeholder="state.placeholder"
-            :error="state.error"
+            :invalid="state.error"
             :disabled="state.disabled"
             :size="state.size"
           />
@@ -83,7 +83,7 @@ const sizes: ('sm' | 'md' | 'lg')[] = ['sm', 'md', 'lg']
 
     <Variant title="Error State">
       <div style="padding: 2rem; max-width: 400px; margin: 0 auto;">
-        <FormulaInput model-value="H2O" error />
+        <FormulaInput model-value="H2O" invalid />
       </div>
     </Variant>
 

package/src/components/FormulaInput.vue

@@ -5,14 +5,14 @@
  * the field in the error state and names the symbol.
  */
 import { computed, ref } from 'vue'
-import { useChemicalFormula } from '../composables/useChemicalFormula'
+import { calculateMW, parseFormula, renderFormulaParts } from '../utils/formula'
 
 interface Props {
   modelValue?: string
   showPreview?: boolean
   showMW?: boolean
   placeholder?: string
-  error?: boolean
+  invalid?: boolean
   disabled?: boolean
   size?: 'sm' | 'md' | 'lg'
 }
@@ -22,7 +22,7 @@ const props = withDefaults(defineProps<Props>(), {
   showPreview: true,
   showMW: true,
   placeholder: 'e.g. Ca(OH)2',
-  error: false,
+  invalid: false,
   disabled: false,
   size: 'md',
 })
@@ -32,7 +32,6 @@ const emit = defineEmits<{
   'mw': [mw: number | null]
 }>()
 
-const { parseFormula, calculateMW, renderFormulaParts } = useChemicalFormula()
 
 const focused = ref(false)
 
@@ -61,7 +60,7 @@ function handleInput(event: Event) {
   <div
     :class="[
       'mint-formula-input',
-      error || analysis.error ? 'mint-formula-input--error' : '',
+      invalid || analysis.error ? 'mint-formula-input--error' : '',
       disabled ? 'mint-formula-input--disabled' : '',
     ]"
   >
@@ -72,7 +71,7 @@ function handleInput(event: Event) {
           :value="modelValue"
           :placeholder="placeholder"
           :disabled="disabled"
-          :aria-invalid="error || Boolean(analysis.error) || undefined"
+          :aria-invalid="invalid || Boolean(analysis.error) || undefined"
           spellcheck="false"
           autocomplete="off"
           :class="['mint-formula-input__input', showRendered ? 'mint-formula-input__input--masked' : '']"