@itcase/storybook-config 1.2.70 → 1.2.72

package/README.md

@@ -67,3 +67,12 @@ npm run storybook-react-native-web
 # или:
 make storybook-react-native-web
 ```
+
+## Peer dependencies
+
+Декораторы `withNextDecoratorFactory` и `withUiDecorator` используют `UIProvider` и уведомления из пакетов ITCase UI. В проекте-потребителе должны быть установлены:
+
+- `@itcase/ui-core` — контекст устройства (`useUserDeviceContext`)
+- `@itcase/ui-web` — `NotificationWrapper`
+
+Оба пакета резолвятся из `node_modules` потребителя (не бандлятся в `@itcase/storybook-config`), чтобы React Context был общим с компонентами приложения.

package/dist/{FormSubmitWrapper-DA2tkSEl.js → FormSubmitWrapper-DXUEGLuS.js}

@@ -3,11 +3,11 @@
 var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-D8XyM9rZ.js');
 var React = require('react');
 
-var SUBMIT_TIMEOUT_MS = 15000;
+var SUBMIT_TIMEOUT_MS = 5000;
 var SUBMIT_POLL_MS = 50;
 function getMountRoot() {
-  var _ref, _document$getElementB;
-  return (_ref = (_document$getElementB = document.getElementById('storybook-root')) !== null && _document$getElementB !== void 0 ? _document$getElementB : document.getElementById('root')) !== null && _ref !== void 0 ? _ref : document.body;
+  var _document$getElementB;
+  return (_document$getElementB = document.getElementById('storybook-root')) !== null && _document$getElementB !== void 0 ? _document$getElementB : document.body;
 }
 function sleep() {
   var ms = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : SUBMIT_POLL_MS;
@@ -15,145 +15,137 @@ function sleep() {
     setTimeout(resolve, ms);
   });
 }
-function prepareFormForAutoSubmit(form) {
-  var _config$field, _fieldState$value, _config$suffix;
-  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var fieldNames = typeof (form === null || form === void 0 ? void 0 : form.getRegisteredFields) === 'function' ? form.getRegisteredFields() : [];
-  var fieldName = (_config$field = config.field) !== null && _config$field !== void 0 ? _config$field : fieldNames[0];
-  if (!fieldName) {
-    return false;
-  }
-  var fieldState = form.getFieldState(fieldName);
-  var value = (_fieldState$value = fieldState === null || fieldState === void 0 ? void 0 : fieldState.value) !== null && _fieldState$value !== void 0 ? _fieldState$value : '';
-  var suffix = (_config$suffix = config.suffix) !== null && _config$suffix !== void 0 ? _config$suffix : "\u200B";
-  var nextValue = "".concat(value).concat(suffix);
-  if (nextValue === value) {
-    return false;
-  }
-  form.change(fieldName, nextValue);
-  return true;
-}
 function findSubmitButton(root) {
+  var _root$querySelector;
   if (!root) {
     return null;
   }
-  var byType = root.querySelector('button[type="submit"]');
-  if (byType) {
-    return byType;
-  }
-  var form = root.querySelector('form[data-testid], form');
-  if (!form) {
-    return null;
-  }
-  var primaryInGroup = form.querySelector('.form__button .form__button-item, .form__button-item');
-  if (primaryInGroup) {
-    return primaryInGroup;
-  }
-  var byTestId = form.querySelector('button[data-testid*="Submit"], button[data-testid*="SignIn"], button[data-testid*="Create"]');
-  return byTestId;
+  return (_root$querySelector = root.querySelector('button[type="submit"]')) !== null && _root$querySelector !== void 0 ? _root$querySelector : root.querySelector('button.form__button-item');
 }
-function canSubmitFormApi(form) {
-  return typeof (form === null || form === void 0 ? void 0 : form.submit) === 'function' && typeof (form === null || form === void 0 ? void 0 : form.getRegisteredFields) === 'function' && form.getRegisteredFields().length > 0;
+function isSubmitButton(button) {
+  return (button === null || button === void 0 ? void 0 : button.type) === 'submit';
 }
-function isNativeSubmitButton(button) {
-  if (!button) {
-    return false;
-  }
-  var type = button.type || button.getAttribute('type');
-  return type === 'submit';
+function canUseFormApi(form) {
+  return typeof (form === null || form === void 0 ? void 0 : form.submit) === 'function';
 }
-function triggerFormSubmit(_ref2) {
-  var form = _ref2.form,
-    submitButton = _ref2.submitButton;
-  if (isNativeSubmitButton(submitButton)) {
-    submitButton.click();
-    return true;
+function prepareFormForAutoSubmit(form) {
+  var _config$field, _form$getFieldState$v, _form$getFieldState, _config$suffix;
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  if (!canUseFormApi(form) || typeof form.getRegisteredFields !== 'function') {
+    return;
   }
-  if (canSubmitFormApi(form)) {
-    form.submit();
-    return true;
+  var fieldName = (_config$field = config.field) !== null && _config$field !== void 0 ? _config$field : form.getRegisteredFields()[0];
+  if (!fieldName) {
+    return;
   }
-  var htmlForm = submitButton === null || submitButton === void 0 ? void 0 : submitButton.closest('form');
-  if (htmlForm && typeof htmlForm.requestSubmit === 'function') {
-    htmlForm.requestSubmit();
-    return true;
+  var value = (_form$getFieldState$v = (_form$getFieldState = form.getFieldState(fieldName)) === null || _form$getFieldState === void 0 ? void 0 : _form$getFieldState.value) !== null && _form$getFieldState$v !== void 0 ? _form$getFieldState$v : '';
+  var nextValue = "".concat(value).concat((_config$suffix = config.suffix) !== null && _config$suffix !== void 0 ? _config$suffix : "\u200B");
+  if (nextValue !== value) {
+    form.change(fieldName, nextValue);
   }
-  if (submitButton) {
+}
+function triggerFormSubmit(_ref) {
+  var _submitButton$closest, _submitButton$closest2;
+  var form = _ref.form,
+    submitButton = _ref.submitButton;
+  if (isSubmitButton(submitButton)) {
     submitButton.click();
-    return true;
+    return;
+  }
+  if (canUseFormApi(form)) {
+    form.submit();
+    return;
   }
-  return false;
+  submitButton === null || submitButton === void 0 || (_submitButton$closest = submitButton.closest('form')) === null || _submitButton$closest === void 0 || (_submitButton$closest2 = _submitButton$closest.requestSubmit) === null || _submitButton$closest2 === void 0 || _submitButton$closest2.call(_submitButton$closest);
 }
-function getFormSubmitTarget(formRef) {
-  var root = getMountRoot();
-  var submitButton = findSubmitButton(root);
-  var form = formRef.current;
-  var hasFields = typeof (form === null || form === void 0 ? void 0 : form.getRegisteredFields) === 'function' && form.getRegisteredFields().length > 0;
+function getSubmitTarget(formRef) {
+  var submitButton = findSubmitButton(getMountRoot());
   return {
-    canMarkForm: Boolean(form && hasFields),
-    canSubmit: Boolean(submitButton) || canSubmitFormApi(form),
-    form: form,
+    canSubmit: Boolean(submitButton) || canUseFormApi(formRef.current),
+    form: formRef.current,
     submitButton: submitButton
   };
 }
-function autoSubmitForm(_x, _x2, _x3) {
+function bindSubmitButtonClick(formRef, signal) {
+  var root = getMountRoot();
+  if (!root) {
+    return undefined;
+  }
+  var handler = function handler(event) {
+    if (signal.aborted) {
+      return;
+    }
+    var submitButton = findSubmitButton(root);
+    if (!submitButton || isSubmitButton(submitButton)) {
+      return;
+    }
+    if (event.target !== submitButton && !submitButton.contains(event.target)) {
+      return;
+    }
+    event.preventDefault();
+    triggerFormSubmit({
+      form: formRef.current,
+      submitButton: submitButton
+    });
+  };
+  root.addEventListener('click', handler, true);
+  return function () {
+    root.removeEventListener('click', handler, true);
+  };
+}
+function autoSubmitForm(_x) {
   return _autoSubmitForm.apply(this, arguments);
 }
 function _autoSubmitForm() {
-  _autoSubmitForm = _rollupPluginBabelHelpers._asyncToGenerator(/*#__PURE__*/_rollupPluginBabelHelpers._regenerator().m(function _callee(formRef, formSubmitConfig, signal) {
-    var deadline, didPrepareUnchangedSubmit, _getFormSubmitTarget, canMarkForm, canSubmit, form, submitButton;
+  _autoSubmitForm = _rollupPluginBabelHelpers._asyncToGenerator(/*#__PURE__*/_rollupPluginBabelHelpers._regenerator().m(function _callee(formRef) {
+    var formSubmitConfig,
+      signal,
+      didPrepareUnchangedSubmit,
+      deadline,
+      _getSubmitTarget,
+      canSubmit,
+      form,
+      submitButton,
+      _args = arguments;
     return _rollupPluginBabelHelpers._regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          deadline = Date.now() + SUBMIT_TIMEOUT_MS;
+          formSubmitConfig = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+          signal = _args.length > 2 ? _args[2] : undefined;
           didPrepareUnchangedSubmit = false;
+          deadline = Date.now() + SUBMIT_TIMEOUT_MS;
         case 1:
-          if (!(Date.now() < deadline)) {
-            _context.n = 9;
-            break;
-          }
-          if (!signal.aborted) {
-            _context.n = 2;
+          if (!(Date.now() < deadline && !signal.aborted)) {
+            _context.n = 6;
             break;
           }
-          return _context.a(2);
-        case 2:
-          _getFormSubmitTarget = getFormSubmitTarget(formRef), canMarkForm = _getFormSubmitTarget.canMarkForm, canSubmit = _getFormSubmitTarget.canSubmit, form = _getFormSubmitTarget.form, submitButton = _getFormSubmitTarget.submitButton;
+          _getSubmitTarget = getSubmitTarget(formRef), canSubmit = _getSubmitTarget.canSubmit, form = _getSubmitTarget.form, submitButton = _getSubmitTarget.submitButton;
           if (canSubmit) {
-            _context.n = 4;
+            _context.n = 3;
             break;
           }
-          _context.n = 3;
+          _context.n = 2;
           return sleep();
-        case 3:
+        case 2:
           return _context.a(3, 1);
-        case 4:
+        case 3:
           if (!(formSubmitConfig !== null && formSubmitConfig !== void 0 && formSubmitConfig.allowUnchangedSubmit && !didPrepareUnchangedSubmit)) {
-            _context.n = 8;
-            break;
-          }
-          if (!canMarkForm) {
-            _context.n = 6;
+            _context.n = 5;
             break;
           }
           prepareFormForAutoSubmit(form, formSubmitConfig);
           didPrepareUnchangedSubmit = true;
-          _context.n = 5;
+          _context.n = 4;
           return sleep();
-        case 5:
-          return _context.a(3, 1);
-        case 6:
-          _context.n = 7;
-          return sleep();
-        case 7:
+        case 4:
           return _context.a(3, 1);
-        case 8:
+        case 5:
           triggerFormSubmit({
             form: form,
             submitButton: submitButton
           });
           return _context.a(2);
-        case 9:
+        case 6:
           return _context.a(2);
       }
     }, _callee);
@@ -204,7 +196,8 @@ function withFormRef(children, formRef, bindings) {
 
 /**
  * Авто-submit для интерактивного Storybook (Require / Validation / ServerError).
- * При type="button" вызывает formRef.current.submit() (final-form API).
+ * При primaryButtonHtmlType="button" вызывает formRef.current.submit() (final-form API)
+ * и вешает click на кнопку, чтобы ручной submit тоже работал.
  * В Vitest не используется — submit делается в play.
  */
 function FormSubmitWrapper(props) {
@@ -219,6 +212,17 @@ function FormSubmitWrapper(props) {
     submit = _props$submit === void 0 ? true : _props$submit,
     children = props.children;
   var formSubmitConfig = parameters === null || parameters === void 0 ? void 0 : parameters.formSubmit;
+  React.useEffect(function () {
+    if (!submit) {
+      return undefined;
+    }
+    var abortController = new AbortController();
+    var unbindClick = bindSubmitButtonClick(formRef, abortController.signal);
+    return function () {
+      abortController.abort();
+      unbindClick === null || unbindClick === void 0 || unbindClick();
+    };
+  }, [formSubmitConfig, submit]);
   React.useEffect(function () {
     if (!submit) {
       return undefined;

package/dist/cjs/components/FormSubmitWrapper.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var FormSubmitWrapper = require('../../FormSubmitWrapper-DA2tkSEl.js');
+var FormSubmitWrapper = require('../../FormSubmitWrapper-DXUEGLuS.js');
 require('../../_rollupPluginBabelHelpers-D8XyM9rZ.js');
 require('react');
 

package/dist/cjs/decorators/withFigmaSourceLink.js

@@ -2,7 +2,63 @@
 
 var _rollupPluginBabelHelpers = require('../../_rollupPluginBabelHelpers-D8XyM9rZ.js');
 var React = require('react');
-var s = require('lodash/castArray');
+var isArray = require('../../isArray-DJguRq_2.js');
+
+var castArray_1;
+var hasRequiredCastArray;
+
+function requireCastArray () {
+	if (hasRequiredCastArray) return castArray_1;
+	hasRequiredCastArray = 1;
+	var isArray$1 = isArray.requireIsArray();
+
+	/**
+	 * Casts `value` as an array if it's not one.
+	 *
+	 * @static
+	 * @memberOf _
+	 * @since 4.4.0
+	 * @category Lang
+	 * @param {*} value The value to inspect.
+	 * @returns {Array} Returns the cast array.
+	 * @example
+	 *
+	 * _.castArray(1);
+	 * // => [1]
+	 *
+	 * _.castArray({ 'a': 1 });
+	 * // => [{ 'a': 1 }]
+	 *
+	 * _.castArray('abc');
+	 * // => ['abc']
+	 *
+	 * _.castArray(null);
+	 * // => [null]
+	 *
+	 * _.castArray(undefined);
+	 * // => [undefined]
+	 *
+	 * _.castArray();
+	 * // => []
+	 *
+	 * var array = [1, 2, 3];
+	 * console.log(_.castArray(array) === array);
+	 * // => true
+	 */
+	function castArray() {
+	  if (!arguments.length) {
+	    return [];
+	  }
+	  var value = arguments[0];
+	  return isArray$1(value) ? value : [value];
+	}
+
+	castArray_1 = castArray;
+	return castArray_1;
+}
+
+var castArrayExports = requireCastArray();
+var castArray = /*@__PURE__*/isArray.getDefaultExportFromCjs(castArrayExports);
 
 function withFigmaSourceLink() {
   var decorator = function decorator(Story, _ref) {
@@ -10,7 +66,7 @@ function withFigmaSourceLink() {
       context = _ref.context;
     var sourceLink = parameters.sourceLink || {};
     if (parameters.design) {
-      var designList = s(parameters.design);
+      var designList = castArray(parameters.design);
       if (!sourceLink.links) {
         sourceLink.links = {};
       }