diff --git a/packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-default-1-firefox-darwin.png deleted file mode 100644 index 0c1b1d4a..00000000 Binary files a/packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-default-1-firefox-darwin.png and /dev/null differ diff --git a/packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-disabled-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-disabled-1-firefox-darwin.png deleted file mode 100644 index 99efc2cc..00000000 Binary files a/packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-disabled-1-firefox-darwin.png and /dev/null differ diff --git a/packages/design-to-code-react/snapshots/form/controls/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-base-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-base-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-base-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-base-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-disabled-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-disabled-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-disabled-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-disabled-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-invalid-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-invalid-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-invalid-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-invalid-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-invalid-error-list-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-invalid-error-list-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-invalid-error-list-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-invalid-error-list-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-invalid-inline-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-invalid-inline-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-invalid-inline-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.array.spec.pw.snapshot.ts-snapshots/array-snapshot-invalid-inline-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-base-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-base-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-base-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-base-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-disabled-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-disabled-1-firefox-darwin.png new file mode 100644 index 00000000..559e9701 Binary files /dev/null and b/packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-disabled-1-firefox-darwin.png differ diff --git a/packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-blur-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-blur-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-blur-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-blur-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-error-list-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-error-list-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-error-list-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-error-list-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-inline-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-inline-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-inline-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.button.spec.pw.snapshot.ts-snapshots/button-snapshot-invalid-inline-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-base-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-base-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-base-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-base-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-disabled-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-disabled-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-disabled-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-disabled-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-blur-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-blur-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-blur-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-blur-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-error-list-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-error-list-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-error-list-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-error-list-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-inline-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-inline-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-inline-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.checkbox.spec.pw.snapshot.ts-snapshots/checkbox-snapshot-invalid-inline-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-base-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-base-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-base-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-base-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-disabled-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-disabled-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-disabled-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-disabled-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-blur-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-blur-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-blur-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-blur-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-error-list-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-error-list-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-error-list-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-error-list-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-inline-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-inline-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-inline-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.display.spec.pw.snapshot.ts-snapshots/display-snapshot-invalid-inline-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-base-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-base-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-base-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-base-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-disabled-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-disabled-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-disabled-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-disabled-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-blur-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-blur-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-blur-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-blur-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-error-list-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-error-list-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-error-list-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-error-list-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-inline-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-inline-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-inline-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.number-field.spec.pw.snapshot.ts-snapshots/numberField-snapshot-invalid-inline-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-base-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-base-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-base-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-base-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-disabled-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-disabled-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-disabled-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-disabled-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-invalid-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-invalid-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-invalid-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-invalid-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-invalid-error-list-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-invalid-error-list-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-invalid-error-list-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-invalid-error-list-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-invalid-inline-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-invalid-inline-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-invalid-inline-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.section-link.spec.pw.snapshot.ts-snapshots/sectionLink-snapshot-invalid-inline-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.section.spec.pw.snapshot.ts-snapshots/section-snapshot-one-of-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.section.spec.pw.snapshot.ts-snapshots/section-snapshot-one-of-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.section.spec.pw.snapshot.ts-snapshots/section-snapshot-one-of-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.section.spec.pw.snapshot.ts-snapshots/section-snapshot-one-of-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-base-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-base-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-base-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-base-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-disabled-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-disabled-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-disabled-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-disabled-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-blur-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-blur-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-blur-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-blur-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-error-list-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-error-list-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-error-list-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-error-list-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-inline-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-inline-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-inline-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.select.spec.pw.snapshot.ts-snapshots/select-snapshot-invalid-inline-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-base-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-base-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-base-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-base-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-disabled-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-disabled-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-disabled-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-disabled-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-blur-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-blur-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-blur-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-blur-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-default-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-default-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-default-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-default-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-error-list-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-error-list-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-error-list-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-error-list-1-firefox-darwin.png diff --git a/packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-inline-1-firefox-darwin.png b/packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-inline-1-firefox-darwin.png similarity index 100% rename from packages/design-to-code-react/snapshots/form/controls/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-inline-1-firefox-darwin.png rename to packages/design-to-code-react/snapshots/form/controls/type/control.textarea.spec.pw.snapshot.ts-snapshots/textarea-snapshot-invalid-inline-1-firefox-darwin.png diff --git a/packages/design-to-code-react/src/__tests__/schemas/control.array.display-text.schema.ts b/packages/design-to-code-react/src/__tests__/schemas/control.array.display-text.schema.ts index 66c93b81..b3d0f236 100644 --- a/packages/design-to-code-react/src/__tests__/schemas/control.array.display-text.schema.ts +++ b/packages/design-to-code-react/src/__tests__/schemas/control.array.display-text.schema.ts @@ -1,4 +1,4 @@ -import { displayTextDataLocationKey } from "../../form/controls/control.array"; +import { displayTextDataLocationKey } from "../../form/controls/type/control.array"; export default { $schema: "http://json-schema.org/schema#", diff --git a/packages/design-to-code-react/src/form/controls/index.ts b/packages/design-to-code-react/src/form/controls/index.ts index e9e94aa5..f58b8228 100644 --- a/packages/design-to-code-react/src/form/controls/index.ts +++ b/packages/design-to-code-react/src/form/controls/index.ts @@ -1,24 +1,2 @@ -import ArrayControl from "./control.array"; -import ButtonControl from "./control.button"; -import CheckboxControl from "./control.checkbox"; -import DisplayControl from "./control.display"; -import NumberFieldControl from "./control.number-field"; -import SectionControl from "./control.section"; -import SectionLinkControl from "./control.section-link"; -import SelectControl from "./control.select"; -import TextareaControl from "./control.textarea"; -import LinkedDataControl from "./control.linked-data"; - -export { - ArrayControl, - ButtonControl, - CheckboxControl, - DisplayControl, - LinkedDataControl, - NumberFieldControl, - SectionControl, - SectionLinkControl, - SelectControl, - TextareaControl, -}; +export * from "./type"; export * from "./format"; diff --git a/packages/design-to-code-react/src/form/controls/control.array.props.ts b/packages/design-to-code-react/src/form/controls/type/control.array.props.ts similarity index 59% rename from packages/design-to-code-react/src/form/controls/control.array.props.ts rename to packages/design-to-code-react/src/form/controls/type/control.array.props.ts index 7169ba5f..361d8994 100644 --- a/packages/design-to-code-react/src/form/controls/control.array.props.ts +++ b/packages/design-to-code-react/src/form/controls/type/control.array.props.ts @@ -1,4 +1,4 @@ -import { ArrayControlConfig, DragState } from "../templates"; +import { ArrayControlConfig, DragState } from "../../templates"; export type ArrayControlProps = ArrayControlConfig; diff --git a/packages/design-to-code-react/src/form/controls/control.array.spec.pw.snapshot.ts b/packages/design-to-code-react/src/form/controls/type/control.array.spec.pw.snapshot.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.array.spec.pw.snapshot.ts rename to packages/design-to-code-react/src/form/controls/type/control.array.spec.pw.snapshot.ts diff --git a/packages/design-to-code-react/src/form/controls/control.array.spec.pw.ts b/packages/design-to-code-react/src/form/controls/type/control.array.spec.pw.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.array.spec.pw.ts rename to packages/design-to-code-react/src/form/controls/type/control.array.spec.pw.ts diff --git a/packages/design-to-code-react/src/form/controls/control.array.style.css b/packages/design-to-code-react/src/form/controls/type/control.array.style.css similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.array.style.css rename to packages/design-to-code-react/src/form/controls/type/control.array.style.css diff --git a/packages/design-to-code-react/src/form/controls/control.array.tsx b/packages/design-to-code-react/src/form/controls/type/control.array.tsx similarity index 97% rename from packages/design-to-code-react/src/form/controls/control.array.tsx rename to packages/design-to-code-react/src/form/controls/type/control.array.tsx index 8f32a5ad..1c71bb72 100644 --- a/packages/design-to-code-react/src/form/controls/control.array.tsx +++ b/packages/design-to-code-react/src/form/controls/type/control.array.tsx @@ -1,9 +1,9 @@ import { uniqueId } from "lodash-es"; import React, { useState } from "react"; -import { getArrayLinks, isRootLocation } from "./utilities/form"; -import { ArrayControlProps, ArrayControlState } from "./control.array.props"; -import { DragItem, ItemType } from "../templates"; -import { ArrayAction } from "../templates/types"; +import { getArrayLinks } from "../utilities/form"; +import { ArrayControlProps } from "./control.array.props"; +import { DragItem, ItemType } from "../../templates"; +import { ArrayAction } from "../../templates/types"; import { classNames } from "@microsoft/fast-web-utilities"; import cssVariables from "design-to-code/dist/stylesheets/web-components/style/global.css-variables.css"; import addItemStyle from "design-to-code/dist/stylesheets/web-components/style/common.add-item.css"; diff --git a/packages/design-to-code-react/src/form/controls/control.button.props.ts b/packages/design-to-code-react/src/form/controls/type/control.button.props.ts similarity index 50% rename from packages/design-to-code-react/src/form/controls/control.button.props.ts rename to packages/design-to-code-react/src/form/controls/type/control.button.props.ts index e67f73b7..eb6e76b9 100644 --- a/packages/design-to-code-react/src/form/controls/control.button.props.ts +++ b/packages/design-to-code-react/src/form/controls/type/control.button.props.ts @@ -1,3 +1,3 @@ -import { CommonControlConfig } from "../templates"; +import { CommonControlConfig } from "../../templates"; export type ButtonControlProps = CommonControlConfig; diff --git a/packages/design-to-code-react/src/form/controls/control.button.spec.pw.snapshot.ts b/packages/design-to-code-react/src/form/controls/type/control.button.spec.pw.snapshot.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.button.spec.pw.snapshot.ts rename to packages/design-to-code-react/src/form/controls/type/control.button.spec.pw.snapshot.ts diff --git a/packages/design-to-code-react/src/form/controls/control.button.spec.pw.ts b/packages/design-to-code-react/src/form/controls/type/control.button.spec.pw.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.button.spec.pw.ts rename to packages/design-to-code-react/src/form/controls/type/control.button.spec.pw.ts diff --git a/packages/design-to-code-react/src/form/controls/control.button.style.css b/packages/design-to-code-react/src/form/controls/type/control.button.style.css similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.button.style.css rename to packages/design-to-code-react/src/form/controls/type/control.button.style.css diff --git a/packages/design-to-code-react/src/form/controls/control.button.tsx b/packages/design-to-code-react/src/form/controls/type/control.button.tsx similarity index 98% rename from packages/design-to-code-react/src/form/controls/control.button.tsx rename to packages/design-to-code-react/src/form/controls/type/control.button.tsx index 6ee0bb35..c4aa2fae 100644 --- a/packages/design-to-code-react/src/form/controls/control.button.tsx +++ b/packages/design-to-code-react/src/form/controls/type/control.button.tsx @@ -1,7 +1,7 @@ import React from "react"; import { ButtonControlProps } from "./control.button.props"; import { classNames } from "@microsoft/fast-web-utilities"; -import { isDefault } from "./utilities/form"; +import { isDefault } from "../utilities/form"; import cssVariables from "design-to-code/dist/stylesheets/web-components/style/global.css-variables.css"; import inputStyle from "design-to-code/dist/stylesheets/web-components/style/common.input.css"; import defaultFontStyle from "design-to-code/dist/stylesheets/web-components/style/common.default-font.css"; diff --git a/packages/design-to-code-react/src/form/controls/control.checkbox.props.ts b/packages/design-to-code-react/src/form/controls/type/control.checkbox.props.ts similarity index 50% rename from packages/design-to-code-react/src/form/controls/control.checkbox.props.ts rename to packages/design-to-code-react/src/form/controls/type/control.checkbox.props.ts index af46a110..541da3ca 100644 --- a/packages/design-to-code-react/src/form/controls/control.checkbox.props.ts +++ b/packages/design-to-code-react/src/form/controls/type/control.checkbox.props.ts @@ -1,3 +1,3 @@ -import { CommonControlConfig } from "../templates"; +import { CommonControlConfig } from "../../templates"; export type CheckboxControlProps = CommonControlConfig; diff --git a/packages/design-to-code-react/src/form/controls/control.checkbox.spec.pw.snapshot.ts b/packages/design-to-code-react/src/form/controls/type/control.checkbox.spec.pw.snapshot.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.checkbox.spec.pw.snapshot.ts rename to packages/design-to-code-react/src/form/controls/type/control.checkbox.spec.pw.snapshot.ts diff --git a/packages/design-to-code-react/src/form/controls/control.checkbox.spec.pw.ts b/packages/design-to-code-react/src/form/controls/type/control.checkbox.spec.pw.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.checkbox.spec.pw.ts rename to packages/design-to-code-react/src/form/controls/type/control.checkbox.spec.pw.ts diff --git a/packages/design-to-code-react/src/form/controls/control.checkbox.style.css b/packages/design-to-code-react/src/form/controls/type/control.checkbox.style.css similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.checkbox.style.css rename to packages/design-to-code-react/src/form/controls/type/control.checkbox.style.css diff --git a/packages/design-to-code-react/src/form/controls/control.checkbox.tsx b/packages/design-to-code-react/src/form/controls/type/control.checkbox.tsx similarity index 97% rename from packages/design-to-code-react/src/form/controls/control.checkbox.tsx rename to packages/design-to-code-react/src/form/controls/type/control.checkbox.tsx index 059dbba2..3c064986 100644 --- a/packages/design-to-code-react/src/form/controls/control.checkbox.tsx +++ b/packages/design-to-code-react/src/form/controls/type/control.checkbox.tsx @@ -1,7 +1,7 @@ import React from "react"; import { CheckboxControlProps } from "./control.checkbox.props"; import { classNames } from "@microsoft/fast-web-utilities"; -import { isDefault } from "./utilities/form"; +import { isDefault } from "../utilities/form"; import cssVariables from "design-to-code/dist/stylesheets/web-components/style/global.css-variables.css"; import style from "./control.checkbox.style.css"; diff --git a/packages/design-to-code-react/src/form/controls/control.display.props.ts b/packages/design-to-code-react/src/form/controls/type/control.display.props.ts similarity index 50% rename from packages/design-to-code-react/src/form/controls/control.display.props.ts rename to packages/design-to-code-react/src/form/controls/type/control.display.props.ts index a27d05b5..ad811e60 100644 --- a/packages/design-to-code-react/src/form/controls/control.display.props.ts +++ b/packages/design-to-code-react/src/form/controls/type/control.display.props.ts @@ -1,3 +1,3 @@ -import { CommonControlConfig } from "../templates"; +import { CommonControlConfig } from "../../templates"; export type DisplayControlProps = CommonControlConfig; diff --git a/packages/design-to-code-react/src/form/controls/control.display.spec.pw.snapshot.ts b/packages/design-to-code-react/src/form/controls/type/control.display.spec.pw.snapshot.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.display.spec.pw.snapshot.ts rename to packages/design-to-code-react/src/form/controls/type/control.display.spec.pw.snapshot.ts diff --git a/packages/design-to-code-react/src/form/controls/control.display.spec.pw.ts b/packages/design-to-code-react/src/form/controls/type/control.display.spec.pw.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.display.spec.pw.ts rename to packages/design-to-code-react/src/form/controls/type/control.display.spec.pw.ts diff --git a/packages/design-to-code-react/src/form/controls/control.display.style.css b/packages/design-to-code-react/src/form/controls/type/control.display.style.css similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.display.style.css rename to packages/design-to-code-react/src/form/controls/type/control.display.style.css diff --git a/packages/design-to-code-react/src/form/controls/control.display.tsx b/packages/design-to-code-react/src/form/controls/type/control.display.tsx similarity index 98% rename from packages/design-to-code-react/src/form/controls/control.display.tsx rename to packages/design-to-code-react/src/form/controls/type/control.display.tsx index 92e23100..0c834cc5 100644 --- a/packages/design-to-code-react/src/form/controls/control.display.tsx +++ b/packages/design-to-code-react/src/form/controls/type/control.display.tsx @@ -1,7 +1,7 @@ import React from "react"; import { DisplayControlProps } from "./control.display.props"; import { classNames } from "@microsoft/fast-web-utilities"; -import { isDefault } from "./utilities/form"; +import { isDefault } from "../utilities/form"; import cssVariables from "design-to-code/dist/stylesheets/web-components/style/global.css-variables.css"; import inputStyle from "design-to-code/dist/stylesheets/web-components/style/common.input.css"; import defaultFontStyle from "design-to-code/dist/stylesheets/web-components/style/common.default-font.css"; diff --git a/packages/design-to-code-react/src/form/controls/control.linked-data.props.ts b/packages/design-to-code-react/src/form/controls/type/control.linked-data.props.ts similarity index 78% rename from packages/design-to-code-react/src/form/controls/control.linked-data.props.ts rename to packages/design-to-code-react/src/form/controls/type/control.linked-data.props.ts index 832bdfd3..3fd38c3b 100644 --- a/packages/design-to-code-react/src/form/controls/control.linked-data.props.ts +++ b/packages/design-to-code-react/src/form/controls/type/control.linked-data.props.ts @@ -1,4 +1,4 @@ -import { LinkedDataControlConfig } from "../templates"; +import { LinkedDataControlConfig } from "../../templates"; export interface ChildComponentDataMapping { [T: string]: any; diff --git a/packages/design-to-code-react/src/form/controls/control.linked-data.spec.tsx b/packages/design-to-code-react/src/form/controls/type/control.linked-data.spec.tsx similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.linked-data.spec.tsx rename to packages/design-to-code-react/src/form/controls/type/control.linked-data.spec.tsx diff --git a/packages/design-to-code-react/src/form/controls/control.linked-data.style.css b/packages/design-to-code-react/src/form/controls/type/control.linked-data.style.css similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.linked-data.style.css rename to packages/design-to-code-react/src/form/controls/type/control.linked-data.style.css diff --git a/packages/design-to-code-react/src/form/controls/control.linked-data.tsx b/packages/design-to-code-react/src/form/controls/type/control.linked-data.tsx similarity index 98% rename from packages/design-to-code-react/src/form/controls/control.linked-data.tsx rename to packages/design-to-code-react/src/form/controls/type/control.linked-data.tsx index 184cb866..1cc60e85 100644 --- a/packages/design-to-code-react/src/form/controls/control.linked-data.tsx +++ b/packages/design-to-code-react/src/form/controls/type/control.linked-data.tsx @@ -1,8 +1,8 @@ import React, { useState } from "react"; import { keyEnter, keyTab } from "@microsoft/fast-web-utilities"; import { getDataFromSchema } from "design-to-code"; -import { DragItem, ItemType } from "../templates"; -import { ArrayAction, LinkedDataActionType } from "../templates/types"; +import { DragItem, ItemType } from "../../templates"; +import { ArrayAction, LinkedDataActionType } from "../../templates/types"; import { LinkedDataControlProps } from "./control.linked-data.props"; import cssVariables from "design-to-code/dist/stylesheets/web-components/style/global.css-variables.css"; import cleanListStyle from "design-to-code/dist/stylesheets/web-components/style/common.clean-list.css"; diff --git a/packages/design-to-code-react/src/form/controls/control.number-field.props.ts b/packages/design-to-code-react/src/form/controls/type/control.number-field.props.ts similarity index 51% rename from packages/design-to-code-react/src/form/controls/control.number-field.props.ts rename to packages/design-to-code-react/src/form/controls/type/control.number-field.props.ts index 574534fb..78c08e0b 100644 --- a/packages/design-to-code-react/src/form/controls/control.number-field.props.ts +++ b/packages/design-to-code-react/src/form/controls/type/control.number-field.props.ts @@ -1,3 +1,3 @@ -import { NumberFieldTypeControlConfig } from "../templates"; +import { NumberFieldTypeControlConfig } from "../../templates"; export type NumberFieldControlProps = NumberFieldTypeControlConfig; diff --git a/packages/design-to-code-react/src/form/controls/control.number-field.spec.pw.snapshot.ts b/packages/design-to-code-react/src/form/controls/type/control.number-field.spec.pw.snapshot.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.number-field.spec.pw.snapshot.ts rename to packages/design-to-code-react/src/form/controls/type/control.number-field.spec.pw.snapshot.ts diff --git a/packages/design-to-code-react/src/form/controls/control.number-field.spec.pw.ts b/packages/design-to-code-react/src/form/controls/type/control.number-field.spec.pw.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.number-field.spec.pw.ts rename to packages/design-to-code-react/src/form/controls/type/control.number-field.spec.pw.ts diff --git a/packages/design-to-code-react/src/form/controls/control.number-field.style.css b/packages/design-to-code-react/src/form/controls/type/control.number-field.style.css similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.number-field.style.css rename to packages/design-to-code-react/src/form/controls/type/control.number-field.style.css diff --git a/packages/design-to-code-react/src/form/controls/control.number-field.tsx b/packages/design-to-code-react/src/form/controls/type/control.number-field.tsx similarity index 97% rename from packages/design-to-code-react/src/form/controls/control.number-field.tsx rename to packages/design-to-code-react/src/form/controls/type/control.number-field.tsx index 5129015c..0abdb2b7 100644 --- a/packages/design-to-code-react/src/form/controls/control.number-field.tsx +++ b/packages/design-to-code-react/src/form/controls/type/control.number-field.tsx @@ -1,7 +1,7 @@ -import React, { useEffect, useRef } from "react"; +import React, { useEffect } from "react"; import { NumberFieldControlProps } from "./control.number-field.props"; import { classNames } from "@microsoft/fast-web-utilities"; -import { isDefault } from "./utilities/form"; +import { isDefault } from "../utilities/form"; import cssVariables from "design-to-code/dist/stylesheets/web-components/style/global.css-variables.css"; import inputStyle from "design-to-code/dist/stylesheets/web-components/style/common.input.css"; import defaultFontStyle from "design-to-code/dist/stylesheets/web-components/style/common.default-font.css"; diff --git a/packages/design-to-code-react/src/form/controls/control.section-link.props.ts b/packages/design-to-code-react/src/form/controls/type/control.section-link.props.ts similarity index 52% rename from packages/design-to-code-react/src/form/controls/control.section-link.props.ts rename to packages/design-to-code-react/src/form/controls/type/control.section-link.props.ts index 9038c7a1..5c42f52a 100644 --- a/packages/design-to-code-react/src/form/controls/control.section-link.props.ts +++ b/packages/design-to-code-react/src/form/controls/type/control.section-link.props.ts @@ -1,3 +1,3 @@ -import { SectionLinkControlConfig } from "../templates"; +import { SectionLinkControlConfig } from "../../templates"; export type SectionLinkControlProps = SectionLinkControlConfig; diff --git a/packages/design-to-code-react/src/form/controls/control.section-link.spec.pw.snapshot.ts b/packages/design-to-code-react/src/form/controls/type/control.section-link.spec.pw.snapshot.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.section-link.spec.pw.snapshot.ts rename to packages/design-to-code-react/src/form/controls/type/control.section-link.spec.pw.snapshot.ts diff --git a/packages/design-to-code-react/src/form/controls/control.section-link.spec.pw.ts b/packages/design-to-code-react/src/form/controls/type/control.section-link.spec.pw.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.section-link.spec.pw.ts rename to packages/design-to-code-react/src/form/controls/type/control.section-link.spec.pw.ts diff --git a/packages/design-to-code-react/src/form/controls/control.section-link.style.css b/packages/design-to-code-react/src/form/controls/type/control.section-link.style.css similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.section-link.style.css rename to packages/design-to-code-react/src/form/controls/type/control.section-link.style.css diff --git a/packages/design-to-code-react/src/form/controls/control.section-link.tsx b/packages/design-to-code-react/src/form/controls/type/control.section-link.tsx similarity index 96% rename from packages/design-to-code-react/src/form/controls/control.section-link.tsx rename to packages/design-to-code-react/src/form/controls/type/control.section-link.tsx index 53c8703d..5d41f913 100644 --- a/packages/design-to-code-react/src/form/controls/control.section-link.tsx +++ b/packages/design-to-code-react/src/form/controls/type/control.section-link.tsx @@ -1,7 +1,7 @@ import React from "react"; import { classNames, format } from "@microsoft/fast-web-utilities"; import { SectionLinkControlProps } from "./control.section-link.props"; -import { isDefault } from "./utilities/form"; +import { isDefault } from "../utilities/form"; import cssVariables from "design-to-code/dist/stylesheets/web-components/style/global.css-variables.css"; import defaultFontStyle from "design-to-code/dist/stylesheets/web-components/style/common.default-font.css"; import dtcClassName from "design-to-code/dist/esm/web-components/style/class-names"; diff --git a/packages/design-to-code-react/src/form/controls/control.section.props.ts b/packages/design-to-code-react/src/form/controls/type/control.section.props.ts similarity index 95% rename from packages/design-to-code-react/src/form/controls/control.section.props.ts rename to packages/design-to-code-react/src/form/controls/type/control.section.props.ts index a4c7bcb2..0d672c4a 100644 --- a/packages/design-to-code-react/src/form/controls/control.section.props.ts +++ b/packages/design-to-code-react/src/form/controls/type/control.section.props.ts @@ -1,6 +1,6 @@ import { CombiningKeyword } from "design-to-code"; -import { FormStrings } from "../form.props"; -import { SectionControlConfig } from "../templates"; +import { FormStrings } from "../../form.props"; +import { SectionControlConfig } from "../../templates"; export interface InitialOneOfAnyOfState { /** diff --git a/packages/design-to-code-react/src/form/controls/control.section.spec.pw.snapshot.ts b/packages/design-to-code-react/src/form/controls/type/control.section.spec.pw.snapshot.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.section.spec.pw.snapshot.ts rename to packages/design-to-code-react/src/form/controls/type/control.section.spec.pw.snapshot.ts diff --git a/packages/design-to-code-react/src/form/controls/control.section.spec.pw.ts b/packages/design-to-code-react/src/form/controls/type/control.section.spec.pw.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.section.spec.pw.ts rename to packages/design-to-code-react/src/form/controls/type/control.section.spec.pw.ts diff --git a/packages/design-to-code-react/src/form/controls/control.section.style.css b/packages/design-to-code-react/src/form/controls/type/control.section.style.css similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.section.style.css rename to packages/design-to-code-react/src/form/controls/type/control.section.style.css diff --git a/packages/design-to-code-react/src/form/controls/control.section.tsx b/packages/design-to-code-react/src/form/controls/type/control.section.tsx similarity index 98% rename from packages/design-to-code-react/src/form/controls/control.section.tsx rename to packages/design-to-code-react/src/form/controls/type/control.section.tsx index 4090aaba..a2ae2b0a 100644 --- a/packages/design-to-code-react/src/form/controls/control.section.tsx +++ b/packages/design-to-code-react/src/form/controls/type/control.section.tsx @@ -7,14 +7,14 @@ import { getOneOfAnyOfSelectOptions, getUpdatedCategories, updateControlSectionState, -} from "./utilities/form"; +} from "../utilities/form"; import React, { useEffect, useState } from "react"; -import { get, uniqueId } from "lodash-es"; +import { get } from "lodash-es"; import { CategoryState, SectionControlProps } from "./control.section.props"; -import SectionControlValidation from "./utilities/section.validation"; -import FormControlSwitch from "./utilities/control-switch"; -import FormOneOfAnyOf from "./utilities/section.one-of-any-of"; -import FormDictionary from "./utilities/dictionary"; +import SectionControlValidation from "../utilities/section.validation"; +import FormControlSwitch from "../utilities/control-switch"; +import FormOneOfAnyOf from "../utilities/section.one-of-any-of"; +import FormDictionary from "../utilities/dictionary"; import { classNames } from "@microsoft/fast-web-utilities"; import { CombiningKeyword, diff --git a/packages/design-to-code-react/src/form/controls/control.select.props.ts b/packages/design-to-code-react/src/form/controls/type/control.select.props.ts similarity index 62% rename from packages/design-to-code-react/src/form/controls/control.select.props.ts rename to packages/design-to-code-react/src/form/controls/type/control.select.props.ts index d4940624..bb464640 100644 --- a/packages/design-to-code-react/src/form/controls/control.select.props.ts +++ b/packages/design-to-code-react/src/form/controls/type/control.select.props.ts @@ -1,4 +1,4 @@ -import { ListControlConfig } from "../templates"; +import { ListControlConfig } from "../../templates"; /** * Select state interface diff --git a/packages/design-to-code-react/src/form/controls/control.select.spec.pw.snapshot.ts b/packages/design-to-code-react/src/form/controls/type/control.select.spec.pw.snapshot.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.select.spec.pw.snapshot.ts rename to packages/design-to-code-react/src/form/controls/type/control.select.spec.pw.snapshot.ts diff --git a/packages/design-to-code-react/src/form/controls/control.select.spec.pw.ts b/packages/design-to-code-react/src/form/controls/type/control.select.spec.pw.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.select.spec.pw.ts rename to packages/design-to-code-react/src/form/controls/type/control.select.spec.pw.ts diff --git a/packages/design-to-code-react/src/form/controls/control.select.style.css b/packages/design-to-code-react/src/form/controls/type/control.select.style.css similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.select.style.css rename to packages/design-to-code-react/src/form/controls/type/control.select.style.css diff --git a/packages/design-to-code-react/src/form/controls/control.select.tsx b/packages/design-to-code-react/src/form/controls/type/control.select.tsx similarity index 98% rename from packages/design-to-code-react/src/form/controls/control.select.tsx rename to packages/design-to-code-react/src/form/controls/type/control.select.tsx index b9734d8b..f20c3ae0 100644 --- a/packages/design-to-code-react/src/form/controls/control.select.tsx +++ b/packages/design-to-code-react/src/form/controls/type/control.select.tsx @@ -1,7 +1,7 @@ import React from "react"; import { SelectControlProps } from "./control.select.props"; import { classNames } from "@microsoft/fast-web-utilities"; -import { isDefault } from "./utilities/form"; +import { isDefault } from "../utilities/form"; import cssVariables from "design-to-code/dist/stylesheets/web-components/style/global.css-variables.css"; import selectSpanStyle from "design-to-code/dist/stylesheets/web-components/style/common.select-span.css"; import defaultFontStyle from "design-to-code/dist/stylesheets/web-components/style/common.default-font.css"; diff --git a/packages/design-to-code-react/src/form/controls/control.textarea.props.ts b/packages/design-to-code-react/src/form/controls/type/control.textarea.props.ts similarity index 50% rename from packages/design-to-code-react/src/form/controls/control.textarea.props.ts rename to packages/design-to-code-react/src/form/controls/type/control.textarea.props.ts index e53cc828..2edb49d4 100644 --- a/packages/design-to-code-react/src/form/controls/control.textarea.props.ts +++ b/packages/design-to-code-react/src/form/controls/type/control.textarea.props.ts @@ -1,3 +1,3 @@ -import { TextareaControlConfig } from "../templates"; +import { TextareaControlConfig } from "../../templates"; export type TextareaControlProps = TextareaControlConfig; diff --git a/packages/design-to-code-react/src/form/controls/control.textarea.spec.pw.snapshot.ts b/packages/design-to-code-react/src/form/controls/type/control.textarea.spec.pw.snapshot.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.textarea.spec.pw.snapshot.ts rename to packages/design-to-code-react/src/form/controls/type/control.textarea.spec.pw.snapshot.ts diff --git a/packages/design-to-code-react/src/form/controls/control.textarea.spec.pw.ts b/packages/design-to-code-react/src/form/controls/type/control.textarea.spec.pw.ts similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.textarea.spec.pw.ts rename to packages/design-to-code-react/src/form/controls/type/control.textarea.spec.pw.ts diff --git a/packages/design-to-code-react/src/form/controls/control.textarea.style.css b/packages/design-to-code-react/src/form/controls/type/control.textarea.style.css similarity index 100% rename from packages/design-to-code-react/src/form/controls/control.textarea.style.css rename to packages/design-to-code-react/src/form/controls/type/control.textarea.style.css diff --git a/packages/design-to-code-react/src/form/controls/control.textarea.tsx b/packages/design-to-code-react/src/form/controls/type/control.textarea.tsx similarity index 97% rename from packages/design-to-code-react/src/form/controls/control.textarea.tsx rename to packages/design-to-code-react/src/form/controls/type/control.textarea.tsx index 4483458d..851c08c6 100644 --- a/packages/design-to-code-react/src/form/controls/control.textarea.tsx +++ b/packages/design-to-code-react/src/form/controls/type/control.textarea.tsx @@ -1,7 +1,7 @@ import React, { useState } from "react"; import { TextareaControlProps } from "./control.textarea.props"; import { classNames } from "@microsoft/fast-web-utilities"; -import { isDefault } from "./utilities/form"; +import { isDefault } from "../utilities/form"; import cssVariables from "design-to-code/dist/stylesheets/web-components/style/global.css-variables.css"; import style from "./control.textarea.style.css"; diff --git a/packages/design-to-code-react/src/form/controls/type/index.ts b/packages/design-to-code-react/src/form/controls/type/index.ts new file mode 100644 index 00000000..67dd11be --- /dev/null +++ b/packages/design-to-code-react/src/form/controls/type/index.ts @@ -0,0 +1,23 @@ +import ArrayControl from "./control.array"; +import ButtonControl from "./control.button"; +import CheckboxControl from "./control.checkbox"; +import DisplayControl from "./control.display"; +import NumberFieldControl from "./control.number-field"; +import SectionControl from "./control.section"; +import SectionLinkControl from "./control.section-link"; +import SelectControl from "./control.select"; +import TextareaControl from "./control.textarea"; +import LinkedDataControl from "./control.linked-data"; + +export { + ArrayControl, + ButtonControl, + CheckboxControl, + DisplayControl, + LinkedDataControl, + NumberFieldControl, + SectionControl, + SectionLinkControl, + SelectControl, + TextareaControl, +}; diff --git a/packages/design-to-code-react/src/form/controls/utilities/form.tsx b/packages/design-to-code-react/src/form/controls/utilities/form.tsx index 368349b2..5fe783df 100644 --- a/packages/design-to-code-react/src/form/controls/utilities/form.tsx +++ b/packages/design-to-code-react/src/form/controls/utilities/form.tsx @@ -8,14 +8,12 @@ import { CategoryState, SectionControlProps, SectionControlState, -} from "../control.section.props"; -import { cloneDeep, get, isEmpty, mergeWith, omit, set, unset } from "lodash-es"; +} from "../type/control.section.props"; +import { get, omit } from "lodash-es"; import { CombiningKeyword, DataDictionary, getDataFromSchema, - MessageSystem, - MessageSystemType, normalizeDataLocationToDotNotation, ValidationError, } from "design-to-code";