@atlaskit/link-create 0.1.2 → 0.2.1

package/dist/es2019/index.js

@@ -1,2 +1,3 @@
-export { default, TextField, Select } from './ui/index';
-export { useLinkCreateCallback } from './controllers/callback-context/index';
+export { default, TextField, CreateForm, AsyncSelect } from './ui/index';
+export { useLinkCreateCallback, LinkCreateCallbackProvider } from './controllers/callback-context';
+export { FormContextProvider, useFormContext } from './controllers/form-context';

package/dist/es2019/ui/create-form/async-select/index.js

@@ -0,0 +1 @@
+export { AsyncSelect } from './main';

package/dist/es2019/ui/create-form/async-select/main.js

@@ -0,0 +1,41 @@
+import _extends from "@babel/runtime/helpers/extends";
+/** @jsx jsx */
+import { Fragment, useEffect } from 'react';
+import { jsx } from '@emotion/react';
+import { ErrorMessage, Field, HelperMessage } from '@atlaskit/form';
+import { AsyncSelect as AkAsyncSelect } from '@atlaskit/select';
+import { useFormContext } from '../../../controllers/form-context';
+/**
+ * An async select utilising the Atlaskit AsyncSelect and Field objects from `@atlaskit/form`.
+ * Validation is handled by the form as it is on form submission. Any errors returned by
+ * the handleSubmit function passed to the form <Form> that have a key matching the `name`
+ * of this text field are shown above the field.
+ */
+export function AsyncSelect({
+  label,
+  name,
+  validationHelpText,
+  isRequired,
+  testId,
+  validators,
+  ...rest
+}) {
+  const {
+    assignValidator
+  } = useFormContext();
+  useEffect(() => {
+    if (validators) {
+      assignValidator(name, validators);
+    }
+  }, [name, validators, assignValidator]);
+  return jsx("div", {
+    "data-testid": testId
+  }, jsx(Field, {
+    name: name,
+    label: label,
+    isRequired: isRequired
+  }, ({
+    fieldProps,
+    error
+  }) => jsx(Fragment, null, jsx(AkAsyncSelect, _extends({}, fieldProps, rest)), !error && jsx(HelperMessage, null, validationHelpText), error && jsx(ErrorMessage, null, error))));
+}

package/dist/es2019/ui/create-form/async-select/types.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/ui/create-form/index.js

@@ -0,0 +1,3 @@
+export { CreateForm } from './main';
+export { AsyncSelect } from './async-select';
+export { TextField } from './textfield';

package/dist/es2019/ui/create-form/main.js

@@ -0,0 +1,48 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import LoadingButton from '@atlaskit/button/loading-button';
+import Button from '@atlaskit/button/standard-button';
+import Form, { FormFooter, FormSection } from '@atlaskit/form';
+import { FormContextProvider, useFormContext } from '../../controllers/form-context';
+import { validateFormData } from './utils';
+const withFormContext = Component => props => /*#__PURE__*/React.createElement(FormContextProvider, null, /*#__PURE__*/React.createElement(Component, props));
+const CreateFormWithoutContext = ({
+  children,
+  testId,
+  onCancel,
+  onSubmit
+}) => {
+  const {
+    getValidators
+  } = useFormContext();
+  const handleSubmit = async data => {
+    const validators = getValidators();
+    const errors = validateFormData({
+      data,
+      validators
+    });
+    if (Object.keys(errors).length !== 0) {
+      return errors;
+    }
+    onSubmit(data);
+  };
+  return /*#__PURE__*/React.createElement(Form, {
+    onSubmit: handleSubmit
+  }, ({
+    submitting,
+    formProps
+  }) => /*#__PURE__*/React.createElement("form", _extends({}, formProps, {
+    name: "confluence-creation-form",
+    "data-testid": testId
+  }), /*#__PURE__*/React.createElement(FormSection, null, children), /*#__PURE__*/React.createElement(FormFooter, null, /*#__PURE__*/React.createElement(Button, {
+    appearance: "subtle",
+    onClick: onCancel,
+    testId: 'cancel-button'
+  }, "Cancel"), /*#__PURE__*/React.createElement(LoadingButton, {
+    appearance: "primary",
+    type: "submit",
+    isLoading: submitting,
+    testId: 'create-button'
+  }, "Create"))));
+};
+export const CreateForm = withFormContext(CreateFormWithoutContext);

package/dist/es2019/ui/create-form/textfield/index.js

@@ -0,0 +1 @@
+export { TextField } from './main';

package/dist/es2019/ui/create-form/textfield/main.js

@@ -0,0 +1,42 @@
+import _extends from "@babel/runtime/helpers/extends";
+/** @jsx jsx */
+import { Fragment, useEffect } from 'react';
+import { jsx } from '@emotion/react';
+import { ErrorMessage, Field, HelperMessage } from '@atlaskit/form';
+import AkTextfield from '@atlaskit/textfield';
+import { useFormContext } from '../../../controllers/form-context';
+/**
+ * A text field utilising the Atlaskit Textfield and Field objects from `@atlaskit/form`.
+ * Validation is handled by the form as it is on form submission. Any errors returned by
+ * the handleSubmit function passed to the form <Form> that have a key matching the `name`
+ * of this text field are shown above the field.
+ */
+
+export function TextField({
+  label,
+  name,
+  validationHelpText,
+  isRequired,
+  testId,
+  validators
+}) {
+  const {
+    assignValidator
+  } = useFormContext();
+  useEffect(() => {
+    if (validators) {
+      assignValidator(name, validators);
+    }
+  }, [name, validators, assignValidator]);
+  return jsx(Field, {
+    name: name,
+    label: label,
+    isRequired: isRequired,
+    defaultValue: ''
+  }, ({
+    fieldProps,
+    error
+  }) => jsx(Fragment, null, jsx(AkTextfield, _extends({}, fieldProps, {
+    testId: testId
+  })), !error && jsx(HelperMessage, null, validationHelpText), error && jsx(ErrorMessage, null, error)));
+}

package/dist/es2019/ui/create-form/textfield/types.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/ui/create-form/types.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/ui/create-form/utils/index.js

@@ -0,0 +1,28 @@
+/** Map of field names to errors for that field (or undefined if no error for that field) */
+
+/**
+ * Returns an object where the keys are names of form fields, and values are a string if the field
+ * has an error, or undefined if the field is valid.
+ */
+export function validateFormData({
+  data,
+  validators
+}) {
+  // Run each validator on the input
+  const map = {};
+  for (const fieldName of Object.keys(validators)) {
+    for (let i = 0; i < validators[fieldName].length; i++) {
+      const currentValidator = validators[fieldName][i];
+
+      // If we already have an error for this field, skip any new validations on this field
+      if (map[fieldName] !== undefined) {
+        continue;
+      }
+      const maybeValue = data[fieldName];
+      if (!currentValidator.isValid(maybeValue)) {
+        map[fieldName] = currentValidator.errorMessage;
+      }
+    }
+  }
+  return map;
+}

package/dist/es2019/ui/index.js

@@ -1 +1,4 @@
-export { default, TextField, Select } from './main';
+export { default } from './main';
+export { TextField } from './create-form/textfield';
+export { CreateForm } from './create-form/main';
+export { AsyncSelect } from './create-form/async-select';

package/dist/es2019/ui/main.js

@@ -1,11 +1,6 @@
-import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
-import { Fragment } from 'react';
 import { jsx } from '@emotion/react';
-import { ErrorMessage, Field, HelperMessage } from '@atlaskit/form';
-import Modal, { ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import AkSelect from '@atlaskit/select';
-import AkTextfield from '@atlaskit/textfield';
+import Modal, { ModalBody, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { LinkCreateCallbackProvider } from '../controllers/callback-context';
 export default function LinkCreate({
   plugins,
@@ -24,51 +19,9 @@ export default function LinkCreate({
   return jsx(ModalTransition, null, !!active && jsx(Modal, {
     onClose: onCancel,
     testId: testId
-  }, jsx(ModalHeader, null, jsx(ModalTitle, null, "Create New")), jsx(LinkCreateCallbackProvider, {
+  }, jsx(ModalHeader, null, jsx(ModalTitle, null, "Create New")), jsx(ModalBody, null, jsx(LinkCreateCallbackProvider, {
     onCreate: onCreate,
     onFailure: onFailure,
     onCancel: onCancel
-  }, chosenOne.form)));
-}
-export function Select({
-  name,
-  title,
-  options,
-  defaultOption,
-  placeholder
-}) {
-  return jsx(Field, {
-    name: name,
-    label: title,
-    isRequired: true
-  }, ({
-    fieldProps,
-    error
-  }) => jsx(Fragment, null, error && jsx(ErrorMessage, null, error), jsx(AkSelect, _extends({}, fieldProps, {
-    inputId: `${title}-input-id`,
-    options: options,
-    placeholder: placeholder,
-    defaultValue: defaultOption
-  }))));
-}
-
-/**
- * A text field utilising the Atlaskit Textfield and Field objects from `@atlaskit/form`.
- * Validation is handled by the form as it is on form submission. Any errors returned by
- * the handleSubmit function passed to the form <Form> that have a key matching the `name`
- * of this text field are shown above the field.
- */
-export function TextField({
-  label,
-  name,
-  validationHelpText
-}) {
-  return jsx(Field, {
-    name: name,
-    label: label,
-    isRequired: true
-  }, ({
-    fieldProps,
-    error
-  }) => jsx(Fragment, null, jsx(AkTextfield, fieldProps), !error && jsx(HelperMessage, null, validationHelpText), error && jsx(ErrorMessage, null, error)));
+  }, chosenOne.form))));
 }

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-create",
-	"version": "0.1.2",
+	"version": "0.2.1",
 	"sideEffects": false
 }

package/dist/esm/common/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/controllers/form-context/index.js

@@ -0,0 +1 @@
+export { FormContextProvider, useFormContext } from './main';

package/dist/esm/controllers/form-context/main.js

@@ -0,0 +1,40 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+import React, { createContext, useCallback, useContext, useState } from 'react';
+export var FormContext = /*#__PURE__*/createContext({
+  assignValidator: function assignValidator() {},
+  getValidators: function getValidators() {
+    return {};
+  }
+});
+var FormContextProvider = function FormContextProvider(_ref) {
+  var children = _ref.children;
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    validators = _useState2[0],
+    setValidators = _useState2[1];
+
+  // Use useCallback to prevent infinite useEffect calls
+  var assignValidator = useCallback(function (name, fieldValidators) {
+    setValidators(function (prevValidators) {
+      return _objectSpread(_objectSpread({}, prevValidators), {}, _defineProperty({}, name, fieldValidators));
+    });
+  }, []);
+
+  // Use useCallback to prevent infinite useEffect calls
+  var getValidators = useCallback(function () {
+    return validators;
+  }, [validators]);
+  return /*#__PURE__*/React.createElement(FormContext.Provider, {
+    value: {
+      assignValidator: assignValidator,
+      getValidators: getValidators
+    }
+  }, children);
+};
+var useFormContext = function useFormContext() {
+  return useContext(FormContext);
+};
+export { FormContextProvider, useFormContext };

package/dist/esm/index.js

@@ -1,2 +1,3 @@
-export { default, TextField, Select } from './ui/index';
-export { useLinkCreateCallback } from './controllers/callback-context/index';
+export { default, TextField, CreateForm, AsyncSelect } from './ui/index';
+export { useLinkCreateCallback, LinkCreateCallbackProvider } from './controllers/callback-context';
+export { FormContextProvider, useFormContext } from './controllers/form-context';

package/dist/esm/ui/create-form/async-select/index.js

@@ -0,0 +1 @@
+export { AsyncSelect } from './main';

package/dist/esm/ui/create-form/async-select/main.js

@@ -0,0 +1,42 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["label", "name", "validationHelpText", "isRequired", "testId", "validators"];
+/** @jsx jsx */
+import { Fragment, useEffect } from 'react';
+import { jsx } from '@emotion/react';
+import { ErrorMessage, Field, HelperMessage } from '@atlaskit/form';
+import { AsyncSelect as AkAsyncSelect } from '@atlaskit/select';
+import { useFormContext } from '../../../controllers/form-context';
+/**
+ * An async select utilising the Atlaskit AsyncSelect and Field objects from `@atlaskit/form`.
+ * Validation is handled by the form as it is on form submission. Any errors returned by
+ * the handleSubmit function passed to the form <Form> that have a key matching the `name`
+ * of this text field are shown above the field.
+ */
+export function AsyncSelect(_ref) {
+  var label = _ref.label,
+    name = _ref.name,
+    validationHelpText = _ref.validationHelpText,
+    isRequired = _ref.isRequired,
+    testId = _ref.testId,
+    validators = _ref.validators,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var _useFormContext = useFormContext(),
+    assignValidator = _useFormContext.assignValidator;
+  useEffect(function () {
+    if (validators) {
+      assignValidator(name, validators);
+    }
+  }, [name, validators, assignValidator]);
+  return jsx("div", {
+    "data-testid": testId
+  }, jsx(Field, {
+    name: name,
+    label: label,
+    isRequired: isRequired
+  }, function (_ref2) {
+    var fieldProps = _ref2.fieldProps,
+      error = _ref2.error;
+    return jsx(Fragment, null, jsx(AkAsyncSelect, _extends({}, fieldProps, rest)), !error && jsx(HelperMessage, null, validationHelpText), error && jsx(ErrorMessage, null, error));
+  }));
+}

package/dist/esm/ui/create-form/async-select/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/ui/create-form/index.js

@@ -0,0 +1,3 @@
+export { CreateForm } from './main';
+export { AsyncSelect } from './async-select';
+export { TextField } from './textfield';

package/dist/esm/ui/create-form/main.js

@@ -0,0 +1,73 @@
+import _typeof from "@babel/runtime/helpers/typeof";
+import _extends from "@babel/runtime/helpers/extends";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+import React from 'react';
+import LoadingButton from '@atlaskit/button/loading-button';
+import Button from '@atlaskit/button/standard-button';
+import Form, { FormFooter, FormSection } from '@atlaskit/form';
+import { FormContextProvider, useFormContext } from '../../controllers/form-context';
+import { validateFormData } from './utils';
+var withFormContext = function withFormContext(Component) {
+  return function (props) {
+    return /*#__PURE__*/React.createElement(FormContextProvider, null, /*#__PURE__*/React.createElement(Component, props));
+  };
+};
+var CreateFormWithoutContext = function CreateFormWithoutContext(_ref) {
+  var children = _ref.children,
+    testId = _ref.testId,
+    onCancel = _ref.onCancel,
+    onSubmit = _ref.onSubmit;
+  var _useFormContext = useFormContext(),
+    getValidators = _useFormContext.getValidators;
+  var handleSubmit = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
+      var validators, errors;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              validators = getValidators();
+              errors = validateFormData({
+                data: data,
+                validators: validators
+              });
+              if (!(Object.keys(errors).length !== 0)) {
+                _context.next = 4;
+                break;
+              }
+              return _context.abrupt("return", errors);
+            case 4:
+              onSubmit(data);
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return function handleSubmit(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  return /*#__PURE__*/React.createElement(Form, {
+    onSubmit: handleSubmit
+  }, function (_ref3) {
+    var submitting = _ref3.submitting,
+      formProps = _ref3.formProps;
+    return /*#__PURE__*/React.createElement("form", _extends({}, formProps, {
+      name: "confluence-creation-form",
+      "data-testid": testId
+    }), /*#__PURE__*/React.createElement(FormSection, null, children), /*#__PURE__*/React.createElement(FormFooter, null, /*#__PURE__*/React.createElement(Button, {
+      appearance: "subtle",
+      onClick: onCancel,
+      testId: 'cancel-button'
+    }, "Cancel"), /*#__PURE__*/React.createElement(LoadingButton, {
+      appearance: "primary",
+      type: "submit",
+      isLoading: submitting,
+      testId: 'create-button'
+    }, "Create")));
+  });
+};
+export var CreateForm = withFormContext(CreateFormWithoutContext);

package/dist/esm/ui/create-form/textfield/index.js

@@ -0,0 +1 @@
+export { TextField } from './main';

package/dist/esm/ui/create-form/textfield/main.js

@@ -0,0 +1,41 @@
+import _extends from "@babel/runtime/helpers/extends";
+/** @jsx jsx */
+import { Fragment, useEffect } from 'react';
+import { jsx } from '@emotion/react';
+import { ErrorMessage, Field, HelperMessage } from '@atlaskit/form';
+import AkTextfield from '@atlaskit/textfield';
+import { useFormContext } from '../../../controllers/form-context';
+/**
+ * A text field utilising the Atlaskit Textfield and Field objects from `@atlaskit/form`.
+ * Validation is handled by the form as it is on form submission. Any errors returned by
+ * the handleSubmit function passed to the form <Form> that have a key matching the `name`
+ * of this text field are shown above the field.
+ */
+
+export function TextField(_ref) {
+  var label = _ref.label,
+    name = _ref.name,
+    validationHelpText = _ref.validationHelpText,
+    isRequired = _ref.isRequired,
+    testId = _ref.testId,
+    validators = _ref.validators;
+  var _useFormContext = useFormContext(),
+    assignValidator = _useFormContext.assignValidator;
+  useEffect(function () {
+    if (validators) {
+      assignValidator(name, validators);
+    }
+  }, [name, validators, assignValidator]);
+  return jsx(Field, {
+    name: name,
+    label: label,
+    isRequired: isRequired,
+    defaultValue: ''
+  }, function (_ref2) {
+    var fieldProps = _ref2.fieldProps,
+      error = _ref2.error;
+    return jsx(Fragment, null, jsx(AkTextfield, _extends({}, fieldProps, {
+      testId: testId
+    })), !error && jsx(HelperMessage, null, validationHelpText), error && jsx(ErrorMessage, null, error));
+  });
+}

package/dist/esm/ui/create-form/textfield/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/ui/create-form/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/ui/create-form/utils/index.js

@@ -0,0 +1,28 @@
+/** Map of field names to errors for that field (or undefined if no error for that field) */
+
+/**
+ * Returns an object where the keys are names of form fields, and values are a string if the field
+ * has an error, or undefined if the field is valid.
+ */
+export function validateFormData(_ref) {
+  var data = _ref.data,
+    validators = _ref.validators;
+  // Run each validator on the input
+  var map = {};
+  for (var _i = 0, _Object$keys = Object.keys(validators); _i < _Object$keys.length; _i++) {
+    var fieldName = _Object$keys[_i];
+    for (var i = 0; i < validators[fieldName].length; i++) {
+      var currentValidator = validators[fieldName][i];
+
+      // If we already have an error for this field, skip any new validations on this field
+      if (map[fieldName] !== undefined) {
+        continue;
+      }
+      var maybeValue = data[fieldName];
+      if (!currentValidator.isValid(maybeValue)) {
+        map[fieldName] = currentValidator.errorMessage;
+      }
+    }
+  }
+  return map;
+}

package/dist/esm/ui/index.js

@@ -1 +1,4 @@
-export { default, TextField, Select } from './main';
+export { default } from './main';
+export { TextField } from './create-form/textfield';
+export { CreateForm } from './create-form/main';
+export { AsyncSelect } from './create-form/async-select';

package/dist/esm/ui/main.js

@@ -1,11 +1,6 @@
-import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
-import { Fragment } from 'react';
 import { jsx } from '@emotion/react';
-import { ErrorMessage, Field, HelperMessage } from '@atlaskit/form';
-import Modal, { ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import AkSelect from '@atlaskit/select';
-import AkTextfield from '@atlaskit/textfield';
+import Modal, { ModalBody, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { LinkCreateCallbackProvider } from '../controllers/callback-context';
 export default function LinkCreate(_ref) {
   var plugins = _ref.plugins,
@@ -25,51 +20,9 @@ export default function LinkCreate(_ref) {
   return jsx(ModalTransition, null, !!active && jsx(Modal, {
     onClose: onCancel,
     testId: testId
-  }, jsx(ModalHeader, null, jsx(ModalTitle, null, "Create New")), jsx(LinkCreateCallbackProvider, {
+  }, jsx(ModalHeader, null, jsx(ModalTitle, null, "Create New")), jsx(ModalBody, null, jsx(LinkCreateCallbackProvider, {
     onCreate: onCreate,
     onFailure: onFailure,
     onCancel: onCancel
-  }, chosenOne.form)));
-}
-export function Select(_ref2) {
-  var name = _ref2.name,
-    title = _ref2.title,
-    options = _ref2.options,
-    defaultOption = _ref2.defaultOption,
-    placeholder = _ref2.placeholder;
-  return jsx(Field, {
-    name: name,
-    label: title,
-    isRequired: true
-  }, function (_ref3) {
-    var fieldProps = _ref3.fieldProps,
-      error = _ref3.error;
-    return jsx(Fragment, null, error && jsx(ErrorMessage, null, error), jsx(AkSelect, _extends({}, fieldProps, {
-      inputId: "".concat(title, "-input-id"),
-      options: options,
-      placeholder: placeholder,
-      defaultValue: defaultOption
-    })));
-  });
-}
-
-/**
- * A text field utilising the Atlaskit Textfield and Field objects from `@atlaskit/form`.
- * Validation is handled by the form as it is on form submission. Any errors returned by
- * the handleSubmit function passed to the form <Form> that have a key matching the `name`
- * of this text field are shown above the field.
- */
-export function TextField(_ref4) {
-  var label = _ref4.label,
-    name = _ref4.name,
-    validationHelpText = _ref4.validationHelpText;
-  return jsx(Field, {
-    name: name,
-    label: label,
-    isRequired: true
-  }, function (_ref5) {
-    var fieldProps = _ref5.fieldProps,
-      error = _ref5.error;
-    return jsx(Fragment, null, jsx(AkTextfield, fieldProps), !error && jsx(HelperMessage, null, validationHelpText), error && jsx(ErrorMessage, null, error));
-  });
+  }, chosenOne.form))));
 }

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-create",
-	"version": "0.1.2",
+	"version": "0.2.1",
 	"sideEffects": false
 }