pds-dev-kit-web 1.3.27 → 1.3.28

package/dist/src/common/decorators/withFormProvider.js

@@ -22,7 +22,10 @@ var react_hook_form_1 = require("react-hook-form");
 var components_1 = require("../components");
 var withFormProvider = function (storyFn) {
     var methods = (0, react_hook_form_1.useForm)({ mode: 'onChange' });
+    var handleSubmit = function (data) {
+        console.log('submit success', data);
+    };
     return (react_1.default.createElement(react_hook_form_1.FormProvider, __assign({}, methods),
-        react_1.default.createElement(components_1.Form, { onSubmit: function () { } }, storyFn())));
+        react_1.default.createElement(components_1.Form, { onSubmit: methods.handleSubmit(handleSubmit) }, storyFn())));
 };
 exports.withFormProvider = withFormProvider;

package/dist/src/desktop/common/components/TextFieldBase/TextFieldBase.d.ts

@@ -34,7 +34,8 @@ export declare type TextFieldBaseProps = {
     onKeyDown?: (e: React.KeyboardEvent<HTMLInputElement> | React.KeyboardEvent<HTMLTextAreaElement>) => void;
     onKeyUp?: (e: React.KeyboardEvent<HTMLInputElement> | React.KeyboardEvent<HTMLTextAreaElement>) => void;
     onTarget?: () => void;
+    inputRef?: any;
     [x: string]: any;
 } & Record<string, any>;
-declare function TextFieldBase({ name, hintText, defaultText, validation, preventBlankMode, enterSubmitMode, textLineType, multiRows, autoMinRows, autoMaxRows, inputType, state, colorTheme, min, max, maxLength, textSize, textWeight, textPadding, fieldHeight, deleteIconMode, deleteIconSize, deleteIconColor, isFocused, onBlur, onChange, onFocus, onKeyDown, onKeyUp, onTarget, ...rest }: TextFieldBaseProps): JSX.Element;
+declare function TextFieldBase({ name, hintText, defaultText, validation, preventBlankMode, enterSubmitMode, textLineType, multiRows, autoMinRows, autoMaxRows, inputType, state, colorTheme, min, max, maxLength, textSize, textWeight, textPadding, fieldHeight, deleteIconMode, deleteIconSize, deleteIconColor, isFocused, onBlur, onChange, onFocus, onKeyDown, onKeyUp, onTarget, inputRef, ...rest }: TextFieldBaseProps): JSX.Element;
 export default TextFieldBase;

package/dist/src/desktop/common/components/TextFieldBase/TextFieldBase.js

@@ -52,7 +52,7 @@ var styled_components_1 = __importStar(require("styled-components"));
 var common_1 = require("../../../../common");
 var IconButton_1 = require("../../../components/IconButton");
 function TextFieldBase(_a) {
-    var name = _a.name, hintText = _a.hintText, defaultText = _a.defaultText, validation = _a.validation, _b = _a.preventBlankMode, preventBlankMode = _b === void 0 ? 'none' : _b, _c = _a.enterSubmitMode, enterSubmitMode = _c === void 0 ? 'none' : _c, _d = _a.textLineType, textLineType = _d === void 0 ? 'single' : _d, multiRows = _a.multiRows, autoMinRows = _a.autoMinRows, autoMaxRows = _a.autoMaxRows, _e = _a.inputType, inputType = _e === void 0 ? 'text' : _e, _f = _a.state, state = _f === void 0 ? 'normal' : _f, _g = _a.colorTheme, colorTheme = _g === void 0 ? 'none' : _g, min = _a.min, max = _a.max, _h = _a.maxLength, maxLength = _h === void 0 ? Infinity : _h, _j = _a.textSize, textSize = _j === void 0 ? 'form2' : _j, _k = _a.textWeight, textWeight = _k === void 0 ? 'normal' : _k, textPadding = _a.textPadding, _l = _a.fieldHeight, fieldHeight = _l === void 0 ? 48 : _l, _m = _a.deleteIconMode, deleteIconMode = _m === void 0 ? 'use' : _m, _o = _a.deleteIconSize, deleteIconSize = _o === void 0 ? 20 : _o, _p = _a.deleteIconColor, deleteIconColor = _p === void 0 ? 'ui_cpnt_button_icon_disabled' : _p, isFocused = _a.isFocused, onBlur = _a.onBlur, onChange = _a.onChange, onFocus = _a.onFocus, onKeyDown = _a.onKeyDown, onKeyUp = _a.onKeyUp, onTarget = _a.onTarget, rest = __rest(_a, ["name", "hintText", "defaultText", "validation", "preventBlankMode", "enterSubmitMode", "textLineType", "multiRows", "autoMinRows", "autoMaxRows", "inputType", "state", "colorTheme", "min", "max", "maxLength", "textSize", "textWeight", "textPadding", "fieldHeight", "deleteIconMode", "deleteIconSize", "deleteIconColor", "isFocused", "onBlur", "onChange", "onFocus", "onKeyDown", "onKeyUp", "onTarget"]);
+    var name = _a.name, hintText = _a.hintText, defaultText = _a.defaultText, validation = _a.validation, _b = _a.preventBlankMode, preventBlankMode = _b === void 0 ? 'none' : _b, _c = _a.enterSubmitMode, enterSubmitMode = _c === void 0 ? 'none' : _c, _d = _a.textLineType, textLineType = _d === void 0 ? 'single' : _d, multiRows = _a.multiRows, autoMinRows = _a.autoMinRows, autoMaxRows = _a.autoMaxRows, _e = _a.inputType, inputType = _e === void 0 ? 'text' : _e, _f = _a.state, state = _f === void 0 ? 'normal' : _f, _g = _a.colorTheme, colorTheme = _g === void 0 ? 'none' : _g, min = _a.min, max = _a.max, _h = _a.maxLength, maxLength = _h === void 0 ? Infinity : _h, _j = _a.textSize, textSize = _j === void 0 ? 'form2' : _j, _k = _a.textWeight, textWeight = _k === void 0 ? 'normal' : _k, textPadding = _a.textPadding, _l = _a.fieldHeight, fieldHeight = _l === void 0 ? 48 : _l, _m = _a.deleteIconMode, deleteIconMode = _m === void 0 ? 'use' : _m, _o = _a.deleteIconSize, deleteIconSize = _o === void 0 ? 20 : _o, _p = _a.deleteIconColor, deleteIconColor = _p === void 0 ? 'ui_cpnt_button_icon_disabled' : _p, isFocused = _a.isFocused, onBlur = _a.onBlur, onChange = _a.onChange, onFocus = _a.onFocus, onKeyDown = _a.onKeyDown, onKeyUp = _a.onKeyUp, onTarget = _a.onTarget, inputRef = _a.inputRef, rest = __rest(_a, ["name", "hintText", "defaultText", "validation", "preventBlankMode", "enterSubmitMode", "textLineType", "multiRows", "autoMinRows", "autoMaxRows", "inputType", "state", "colorTheme", "min", "max", "maxLength", "textSize", "textWeight", "textPadding", "fieldHeight", "deleteIconMode", "deleteIconSize", "deleteIconColor", "isFocused", "onBlur", "onChange", "onFocus", "onKeyDown", "onKeyUp", "onTarget", "inputRef"]);
     var _q = (0, react_hook_form_1.useFormContext)(), register = _q.register, setValue = _q.setValue, getValues = _q.getValues, clearErrors = _q.clearErrors;
     var timeout;
     (0, react_1.useEffect)(function () {
@@ -173,16 +173,31 @@ function TextFieldBase(_a) {
     var S_TextFieldBase = function () {
         if (textLineType === 'single') {
             return (react_1.default.createElement(S_InputWrapper, null,
-                react_1.default.createElement(S_Input, __assign({}, register(name, validation), rest, { name: name, defaultValue: defaultText, placeholder: hintText, type: inputType, state: state, readOnly: state === 'read_only', disabled: state === 'disabled', maxLength: maxLength, textSize: textSize, textWeight: textWeight, textPadding: textPadding, colorTheme: colorTheme, min: min, max: max, onFocus: handleFocus, onChange: handleChange, onBlur: handleBlur, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp, ref: ref })),
+                react_1.default.createElement(S_Input, __assign({}, register(name, validation), rest, { name: name, defaultValue: defaultText, placeholder: hintText, type: inputType, state: state, readOnly: state === 'read_only', disabled: state === 'disabled', maxLength: maxLength, textSize: textSize, textWeight: textWeight, textPadding: textPadding, colorTheme: colorTheme, min: min, max: max, onFocus: handleFocus, onChange: handleChange, onBlur: handleBlur, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp, ref: function (e) {
+                        ref(e);
+                        if (inputRef) {
+                            inputRef.current = e;
+                        }
+                    } })),
                 deleteIconMode === 'use' && isFocused && (react_1.default.createElement(IconButton_1.IconButton, { iconName: "ic_delete", baseSize: "small", shapeType: "rectangle", baseColorKey: "ui_cpnt_button_fill_base_transparent", iconSize: deleteIconSize, iconColorKey: deleteIconColor, iconFillType: "fill", state: state === 'disabled' ? 'disabled' : 'normal', tabIndex: -1, onMouseDown: deleteValue }))));
         }
         if (textLineType === 'multi') {
-            return (react_1.default.createElement(S_Multi, __assign({}, register(name, validation), rest, { name: name, defaultValue: defaultText, placeholder: hintText, state: state, readOnly: state === 'read_only' && true, disabled: state === 'disabled' && true, maxLength: maxLength, rows: multiRows, textSize: textSize, textWeight: textWeight, textPadding: textPadding, colorTheme: colorTheme, onFocus: handleFocus, onChange: handleChange, onBlur: handleBlur, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp, ref: ref })));
+            return (react_1.default.createElement(S_Multi, __assign({}, register(name, validation), rest, { name: name, defaultValue: defaultText, placeholder: hintText, state: state, readOnly: state === 'read_only' && true, disabled: state === 'disabled' && true, maxLength: maxLength, rows: multiRows, textSize: textSize, textWeight: textWeight, textPadding: textPadding, colorTheme: colorTheme, onFocus: handleFocus, onChange: handleChange, onBlur: handleBlur, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp, ref: function (e) {
+                    ref(e);
+                    if (inputRef) {
+                        inputRef.current = e;
+                    }
+                } })));
         }
         if (textLineType === 'auto') {
             return (react_1.default.createElement(S_Auto, __assign({}, refRest, rest, { name: name, defaultValue: defaultText, autoMinRows: autoMinRows, autoMaxRows: autoMaxRows, placeholder: hintText, state: state, readOnly: state === 'read_only' && true, disabled: state === 'disabled' && true, maxLength: maxLength, textSize: textSize, textWeight: textWeight, textPadding: textPadding, fieldHeight: fieldHeight, colorTheme: colorTheme, onFocus: handleFocus, onChange: handleChange, onBlur: handleBlur, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp, ref: function (e) {
                     ref(e);
-                    textAreaRef.current = e;
+                    if (textAreaRef) {
+                        textAreaRef.current = e;
+                    }
+                    if (inputRef) {
+                        inputRef.current = e;
+                    }
                 }, onInput: handleResizeHeight })));
         }
     };

package/dist/src/desktop/components/EditApplyTextField/EditApplyTextField.js

@@ -34,10 +34,11 @@ function EditApplyTextField(_a) {
     var _b;
     var name = _a.name, hintText = _a.hintText, defaultText = _a.defaultText, validation = _a.validation, _c = _a.preventBlankMode, preventBlankMode = _c === void 0 ? 'none' : _c, _d = _a.size, size = _d === void 0 ? 'large' : _d, _e = _a.responsiveMode, responsiveMode = _e === void 0 ? 'none' : _e, _f = _a.textLineType, textLineType = _f === void 0 ? 'single' : _f, _g = _a.multiRows, multiRows = _g === void 0 ? 8 : _g, _h = _a.autoMinRows, autoMinRows = _h === void 0 ? 8 : _h, autoMaxRows = _a.autoMaxRows, _j = _a.inputType, inputType = _j === void 0 ? 'text' : _j, _k = _a.state, state = _k === void 0 ? 'normal' : _k, max = _a.max, maxLength = _a.maxLength, min = _a.min, getInputValue = _a.getInputValue, onBlur = _a.onBlur, onChange = _a.onChange, onClickSubmitBtn = _a.onClickSubmitBtn, onFocus = _a.onFocus, onTarget = _a.onTarget;
     var t = (0, react_i18next_1.useTranslation)('translation').t;
-    var _l = (0, react_hook_form_1.useFormContext)(), register = _l.register, setValue = _l.setValue, trigger = _l.trigger, watch = _l.watch, errors = _l.formState.errors;
-    var _m = (0, react_1.useState)(false), isFocused = _m[0], setIsFocused = _m[1];
-    var _o = (0, react_1.useState)(false), isOpen = _o[0], setIsOpen = _o[1];
-    var _p = (0, react_1.useState)(defaultText !== null && defaultText !== void 0 ? defaultText : ''), prevValue = _p[0], setPrevValue = _p[1];
+    var _l = (0, react_hook_form_1.useFormContext)(), register = _l.register, setValue = _l.setValue, trigger = _l.trigger, watch = _l.watch, reset = _l.reset, _m = _l.formState, errors = _m.errors, isSubmitSuccessful = _m.isSubmitSuccessful;
+    var _o = (0, react_1.useState)(false), isFocused = _o[0], setIsFocused = _o[1];
+    var _p = (0, react_1.useState)(false), isOpen = _p[0], setIsOpen = _p[1];
+    var _q = (0, react_1.useState)(defaultText !== null && defaultText !== void 0 ? defaultText : ''), prevValue = _q[0], setPrevValue = _q[1];
+    var ref = (0, react_1.useRef)();
     var currentValue = watch(name);
     var validateOnChange = register(name, validation).onChange;
     var isError = Object.keys(errors).some(function (error) { return error === name; });
@@ -49,6 +50,17 @@ function EditApplyTextField(_a) {
         }
         setValue(name, '');
     }, [defaultText]);
+    /**
+     * @when submit 버튼을 마우스로 클릭한 후 폼 제출에 성공했을 때
+     * @expected 인풋을 블러처리하고 인풋의 값은 유지한 채 isSubmitSuccessful을 초기화합니다.
+     */
+    (0, react_1.useEffect)(function () {
+        var _a;
+        if (isSubmitSuccessful) {
+            (_a = ref === null || ref === void 0 ? void 0 : ref.current) === null || _a === void 0 ? void 0 : _a.blur();
+            reset({ name: name }, { keepValues: true });
+        }
+    }, [isSubmitSuccessful]);
     function handleFocus(e) {
         if (state !== 'read_only') {
             setIsFocused(true);
@@ -82,44 +94,58 @@ function EditApplyTextField(_a) {
     function handleCancel() {
         setValue(name, prevValue);
     }
-    function handleSubmit() {
-        // NOTE: preventBlankMode는 input에만 적용 가능
-        // NOTE: 다른 TextField의 경우 'preventBlankMode === 'trim'일 경우에는 무조건 onBlur 시점에 적용'된다고 정의해두었지만, EditApplyTextField는 onBlur 시점에 모든 값이 초기값으로 돌리는 기획이 있기때문에 EditApplyTextField에서는 submit 버튼을 눌렀을 경우에 시행
+    /*
+     * NOTE
+     * preventBlankMode는 input에만 적용 가능
+     * 다른 TextField의 경우 'preventBlankMode === 'trim'일 경우에는 무조건 onBlur 시점에 적용'된다고 정의해두었지만,
+     * EditApplyTextField는 onBlur 시점에 모든 값이 초기값으로 돌리는 기획이 있기때문에 EditApplyTextField에서는 submit 버튼을 눌렀을 경우에 시행
+     */
+    function checkBlankMode() {
         if (textLineType === 'single' && preventBlankMode === 'trim') {
             setValue(name, currentValue.replace(/^\s+|\s+$/gm, ''));
             setPrevValue(currentValue.replace(/^\s+|\s+$/gm, ''));
-            if (getInputValue)
+            if (getInputValue) {
                 getInputValue([name, currentValue.replace(/^\s+|\s+$/gm, '')]);
+            }
         }
         if (preventBlankMode !== 'trim') {
             setValue(name, currentValue);
             setPrevValue(currentValue);
-            if (getInputValue)
+            if (getInputValue) {
                 getInputValue([name, currentValue]);
+            }
         }
         if (onClickSubmitBtn) {
             onClickSubmitBtn();
         }
     }
-    var handleKeyUp = function (e) {
+    var handleKeyDown = function (e) {
         if (textLineType === 'single' && e.key === 'Enter') {
-            e.target.blur();
-            handleSubmit();
+            checkBlankMode();
         }
         if (e.key === 'Escape') {
             e.target.blur();
         }
     };
+    var handleKeyUp = function (e) {
+        if (textLineType === 'single' && e.key === 'Enter') {
+            e.target.blur();
+        }
+    };
+    var handleMouseDown = function (e) {
+        e.preventDefault();
+        checkBlankMode();
+    };
     var S_TextFieldBase = function () {
         if (textLineType === 'multi') {
-            return (react_1.default.createElement(components_1.TextFieldBase, { name: name, hintText: hintText, defaultText: defaultText, validation: validation, textLineType: "multi", multiRows: multiRows, state: state, maxLength: maxLength, textSize: size === 'large' || size === 'rlarge' ? 'form2' : 'heading', textWeight: size === 'large' || size === 'rlarge' ? 'normal' : 'bold', onFocus: handleFocus, onBlur: handleBlur, onTarget: handleTarget, onChange: handleChange, onKeyUp: handleKeyUp }));
+            return (react_1.default.createElement(components_1.TextFieldBase, { name: name, hintText: hintText, defaultText: defaultText, validation: validation, textLineType: "multi", multiRows: multiRows, state: state, maxLength: maxLength, textSize: size === 'large' || size === 'rlarge' ? 'form2' : 'heading', textWeight: size === 'large' || size === 'rlarge' ? 'normal' : 'bold', onFocus: handleFocus, onBlur: handleBlur, onTarget: handleTarget, onChange: handleChange, inputRef: ref }));
         }
         if (textLineType === 'auto') {
-            return (react_1.default.createElement(components_1.TextFieldBase, { name: name, hintText: hintText, defaultText: defaultText, validation: validation, textLineType: "auto", autoMinRows: autoMinRows, autoMaxRows: autoMaxRows, state: state, maxLength: maxLength, textSize: size === 'large' || size === 'rlarge' ? 'form2' : 'heading', textWeight: size === 'large' || size === 'rlarge' ? 'normal' : 'bold', onFocus: handleFocus, onBlur: handleBlur, onTarget: handleTarget, onChange: handleChange, onKeyUp: handleKeyUp }));
+            return (react_1.default.createElement(components_1.TextFieldBase, { name: name, hintText: hintText, defaultText: defaultText, validation: validation, textLineType: "auto", autoMinRows: autoMinRows, autoMaxRows: autoMaxRows, state: state, maxLength: maxLength, textSize: size === 'large' || size === 'rlarge' ? 'form2' : 'heading', textWeight: size === 'large' || size === 'rlarge' ? 'normal' : 'bold', onFocus: handleFocus, onBlur: handleBlur, onTarget: handleTarget, onChange: handleChange, inputRef: ref }));
         }
         if (textLineType === 'single') {
             return (react_1.default.createElement(react_1.default.Fragment, null,
-                react_1.default.createElement(components_1.TextFieldBase, { name: name, hintText: hintText, defaultText: defaultText, validation: validation, preventBlankMode: preventBlankMode, textLineType: "single", inputType: inputType, state: state, min: min, max: max, maxLength: maxLength, textSize: size === 'large' || size === 'rlarge' ? 'form2' : 'heading', textWeight: size === 'large' || size === 'rlarge' ? 'normal' : 'bold', onFocus: handleFocus, onBlur: handleBlur, onTarget: handleTarget, onChange: handleChange, onKeyUp: handleKeyUp })));
+                react_1.default.createElement(components_1.TextFieldBase, { name: name, hintText: hintText, defaultText: defaultText, validation: validation, preventBlankMode: preventBlankMode, enterSubmitMode: "use", textLineType: "single", inputType: inputType, state: state, min: min, max: max, maxLength: maxLength, textSize: size === 'large' || size === 'rlarge' ? 'form2' : 'heading', textWeight: size === 'large' || size === 'rlarge' ? 'normal' : 'bold', onFocus: handleFocus, onBlur: handleBlur, onTarget: handleTarget, onChange: handleChange, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp, inputRef: ref })));
         }
     };
     return (react_1.default.createElement(react_1.default.Fragment, null,
@@ -128,7 +154,7 @@ function EditApplyTextField(_a) {
                 react_1.default.createElement(S_S_TextFieldBaseWrapper, { size: size, responsiveMode: responsiveMode, textLineType: textLineType, isFocused: isFocused, isError: isError, state: state }, S_TextFieldBase()),
                 isOpen === true && (react_1.default.createElement(S_ButtonBox, null,
                     react_1.default.createElement(IconButton_1.IconButton, { iconName: "ic_xmark", fillType: "fill", baseSize: "small", iconSize: 16, shapeType: "circular", shadow: "visible", iconColorKey: "ui_cpnt_button_icon_enabled", baseColorKey: "ui_cpnt_button_fill_base_white", tabIndex: -1, onMouseDown: handleCancel }),
-                    react_1.default.createElement(IconButton_1.IconButton, { iconName: "ic_check", fillType: "fill", baseSize: "small", iconSize: 16, shapeType: "circular", shadow: "visible", iconColorKey: "ui_cpnt_button_icon_on_primary", baseColorKey: "ui_cpnt_button_fill_base_primary", state: isError === true ? 'disabled' : 'normal', tabIndex: -1, onMouseDown: handleSubmit, type: "submit" })))),
+                    react_1.default.createElement(IconButton_1.IconButton, { iconName: "ic_check", fillType: "fill", baseSize: "small", iconSize: 16, shapeType: "circular", shadow: "visible", iconColorKey: "ui_cpnt_button_icon_on_primary", baseColorKey: "ui_cpnt_button_fill_base_primary", state: isError === true ? 'disabled' : 'normal', tabIndex: -1, onMouseDown: handleMouseDown, type: "submit" })))),
             ((_b = errors[name]) === null || _b === void 0 ? void 0 : _b.message) && (react_1.default.createElement(S_Error, { isFocused: isFocused }, t(errors[name].message))))));
 }
 var S_EditApplyTextFieldWrapper = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  width: ", ";\n"], ["\n  width: ", ";\n"])), function (_a) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pds-dev-kit-web",
-  "version": "1.3.27",
+  "version": "1.3.28",
   "license": "MIT",
   "private": false,
   "main": "dist/index.js",

package/release-note.md

@@ -1,9 +1,6 @@
 # PDS-DEV-KIT-WEB Release Notes
-## [v1.3.27]
+## [v1.3.28]
 
 ### Component
-* IconButton
-  * baseColorKey가 ui_cpnt_button_fill_base_transparent(투명)일때, icon색상 변경
-
-### Color
-* 컬러 키 값 22.05.31 22시 10분 기준 싱크
+* EditApplyTextField
+  * Form 컴포넌트의 onSubmit을 이용했을 때에도 submit과 blur 처리가 제대로 작동할 수 있게끔 수정