Update type controls to be in a separate folder

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#",

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";

packages/design-to-code-react/src/form/controls/control.array.props.ts → 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;
 

packages/design-to-code-react/src/form/controls/control.array.tsx → 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";

packages/design-to-code-react/src/form/controls/control.button.props.ts → 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;

packages/design-to-code-react/src/form/controls/control.button.tsx → 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";

packages/design-to-code-react/src/form/controls/control.checkbox.props.ts → 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;

packages/design-to-code-react/src/form/controls/control.checkbox.tsx → 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";
 

packages/design-to-code-react/src/form/controls/control.display.props.ts → 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;

packages/design-to-code-react/src/form/controls/control.display.tsx → 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";

packages/design-to-code-react/src/form/controls/control.linked-data.props.ts → 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;

packages/design-to-code-react/src/form/controls/control.linked-data.tsx → 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";

packages/design-to-code-react/src/form/controls/control.number-field.props.ts → 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;

packages/design-to-code-react/src/form/controls/control.number-field.tsx → 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";

packages/design-to-code-react/src/form/controls/control.section-link.props.ts → 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;

packages/design-to-code-react/src/form/controls/control.section-link.tsx → 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";

packages/design-to-code-react/src/form/controls/control.section.props.ts → 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 {
     /**

packages/design-to-code-react/src/form/controls/control.section.tsx → 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,

packages/design-to-code-react/src/form/controls/control.select.props.ts → 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

packages/design-to-code-react/src/form/controls/control.select.tsx → 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";

packages/design-to-code-react/src/form/controls/control.textarea.props.ts → 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;

packages/design-to-code-react/src/form/controls/control.textarea.tsx → 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";
 

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,
+};

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";