maru_design2 2.16.2 → 2.16.4

package/dist/index.js

@@ -87,7 +87,7 @@ function styleInject(css, ref) {
 var css_248z$i = "* {\n  /* HTML5 display-role reset for older browsers */\n}\n* html,\n* body,\n* div,\n* span,\n* applet,\n* object,\n* iframe,\n* h1,\n* h2,\n* h3,\n* h4,\n* h5,\n* h6,\n* p,\n* blockquote,\n* pre,\n* a,\n* abbr,\n* acronym,\n* address,\n* big,\n* cite,\n* code,\n* del,\n* dfn,\n* em,\n* img,\n* ins,\n* kbd,\n* q,\n* s,\n* samp,\n* small,\n* strike,\n* strong,\n* sub,\n* sup,\n* tt,\n* var,\n* b,\n* u,\n* i,\n* center,\n* dl,\n* dt,\n* dd,\n* ol,\n* ul,\n* li,\n* fieldset,\n* form,\n* label,\n* legend,\n* table,\n* caption,\n* tbody,\n* tfoot,\n* thead,\n* tr,\n* th,\n* td,\n* article,\n* aside,\n* canvas,\n* details,\n* embed,\n* figure,\n* figcaption,\n* footer,\n* header,\n* hgroup,\n* menu,\n* nav,\n* output,\n* ruby,\n* section,\n* summary,\n* time,\n* mark,\n* audio,\n* video {\n  padding: 0;\n  border: 0;\n  margin: 0;\n  font: inherit;\n  font-size: 100%;\n  vertical-align: baseline;\n}\n* article,\n* aside,\n* details,\n* figcaption,\n* figure,\n* footer,\n* header,\n* hgroup,\n* menu,\n* nav,\n* section {\n  display: block;\n}\n* ol,\n* ul {\n  list-style: none;\n}\n* blockquote,\n* q {\n  quotes: none;\n}\n* blockquote::before,\n* blockquote::after,\n* q::before,\n* q::after {\n  content: \"\";\n  content: none;\n}\n* table {\n  border-collapse: collapse;\n  border-spacing: 0;\n}\n* html {\n  box-sizing: border-box;\n}\n* *,\n* *::before,\n* *::after {\n  box-sizing: inherit;\n}";
 styleInject(css_248z$i);
 
-var css_248z$h = ".scrollbar, * {\n  scrollbar-track-color: #e4e4e4;\n  scrollbar-arrow-color: #e4e4e4;\n  scrollbar-3dlight-color: #e4e4e4;\n  scrollbar-highlight-color: #e4e4e4;\n  scrollbar-shadow-color: #e4e4e4;\n  scrollbar-face-color: #e4e4e4;\n}\n\n.scrollbar::-webkit-scrollbar, ::-webkit-scrollbar {\n  background: inherit;\n  width: 6px;\n  height: 6px;\n}\n\n.scrollbar::-webkit-scrollbar-track, ::-webkit-scrollbar-track {\n  background: none;\n}\n\n.scrollbar::-webkit-scrollbar-thumb, ::-webkit-scrollbar-thumb {\n  background-color: #e4e4e4;\n  border-radius: 16px;\n}\n\n.scrollbar::-webkit-scrollbar-button, ::-webkit-scrollbar-button {\n  display: none;\n}\n\n@font-face {\n  font-family: \"Pretendard\";\n  src: url(\"../../assets/fonts/PretendardVariable.woff2\") format(\"woff2-variations\");\n}\n:root {\n  --primary: var(--p);\n  --primary-50-per: var(--p-50-per);\n  --primary-50: var(--p-50);\n  --primary-20-per: var(--p-20-per);\n  --primary-20: var(--p-20);\n  --primary-10-per: var(--p-10-per);\n  --primary-10: var(--p-10);\n}\n\n[data-theme=blue] {\n  --p: #308acc;\n  --p-50-per: #308acc80;\n  --p-50: #97c4e5;\n  --p-20-per: #308acc33;\n  --p-20: #d6e8f5;\n  --p-10-per: #308acc1a;\n  --p-10: #eaf3fa;\n  --p-05-per: #308acc0d;\n  --p-05: #f5fafd;\n}\n\n[data-theme=green] {\n  --p: #096412;\n  --p-50-per: #09641280;\n  --p-50: #84b188;\n  --p-20-per: #09641233;\n  --p-20: #cee0d0;\n  --p-10-per: #0964121a;\n  --p-10: #e6f0e7;\n  --p-05-per: #0964120d;\n  --p-05: #f3f7f3;\n}";
+var css_248z$h = ".scrollbar, * {\n  scrollbar-track-color: #e4e4e4;\n  scrollbar-arrow-color: #e4e4e4;\n  scrollbar-3dlight-color: #e4e4e4;\n  scrollbar-highlight-color: #e4e4e4;\n  scrollbar-shadow-color: #e4e4e4;\n  scrollbar-face-color: #e4e4e4;\n}\n\n.scrollbar::-webkit-scrollbar, ::-webkit-scrollbar {\n  background: inherit;\n  width: 6px;\n  height: 6px;\n}\n\n.scrollbar::-webkit-scrollbar-track, ::-webkit-scrollbar-track {\n  background: none;\n}\n\n.scrollbar::-webkit-scrollbar-thumb, ::-webkit-scrollbar-thumb {\n  background-color: #e4e4e4;\n  border-radius: 16px;\n}\n\n.scrollbar::-webkit-scrollbar-button, ::-webkit-scrollbar-button {\n  display: none;\n}\n\n@font-face {\n  font-family: \"Pretendard\";\n  src: url(\"../../assets/fonts/PretendardVariable.woff2\") format(\"woff2-variations\");\n}\n* {\n  -webkit-font-smoothing: antialiased;\n}\n\n:root {\n  --primary: var(--p);\n  --primary-50-per: var(--p-50-per);\n  --primary-50: var(--p-50);\n  --primary-20-per: var(--p-20-per);\n  --primary-20: var(--p-20);\n  --primary-10-per: var(--p-10-per);\n  --primary-10: var(--p-10);\n}\n\n[data-theme=blue] {\n  --p: #308acc;\n  --p-50-per: #308acc80;\n  --p-50: #97c4e5;\n  --p-20-per: #308acc33;\n  --p-20: #d6e8f5;\n  --p-10-per: #308acc1a;\n  --p-10: #eaf3fa;\n  --p-05-per: #308acc0d;\n  --p-05: #f5fafd;\n}\n\n[data-theme=green] {\n  --p: #096412;\n  --p-50-per: #09641280;\n  --p-50: #84b188;\n  --p-20-per: #09641233;\n  --p-20: #cee0d0;\n  --p-10-per: #0964121a;\n  --p-10: #e6f0e7;\n  --p-05-per: #0964120d;\n  --p-05: #f3f7f3;\n}";
 styleInject(css_248z$h);
 
 function StyleProvider(_a) {
@@ -4232,8 +4232,8 @@ var Input = /*#__PURE__*/forwardRef(function (_a, inputRef) {
     className = _a.className,
     props = __rest(_a, ["invalid", "label", "type", "onClear", "hiddenClearButton", "wrapperRef", "startNode", "endNode", "className"]);
   var _c = useState(true),
-    pwdVision = _c[0],
-    setPwdVision = _c[1];
+    maskingPassword = _c[0],
+    setMaskingPassword = _c[1]; // *로 보이고 싶으면 true
   var _d = useState(false),
     showClearButton = _d[0],
     setShowClearButton = _d[1];
@@ -4241,7 +4241,7 @@ var Input = /*#__PURE__*/forwardRef(function (_a, inputRef) {
   var hashId = uuidv4(4);
   useEffect(function () {
     return function () {
-      setPwdVision(false);
+      setMaskingPassword(true);
       setShowClearButton(false);
     };
   }, []);
@@ -4318,7 +4318,7 @@ var Input = /*#__PURE__*/forwardRef(function (_a, inputRef) {
       })), jsx("input", __assign({}, props, {
         id: "maru-input-".concat(hashId),
         ref: combineRef,
-        type: type === 'password' && pwdVision ? 'password' : 'text',
+        type: type === 'password' && maskingPassword ? 'password' : 'text',
         onChange: handleInputChange,
         onBlur: handleInputBlur
       })), jsxs("div", __assign({
@@ -4327,14 +4327,17 @@ var Input = /*#__PURE__*/forwardRef(function (_a, inputRef) {
         children: [type === 'password' && !props.disabled && jsx("button", __assign({
           type: "button",
           onClick: function onClick() {
-            return setPwdVision(function (prev) {
+            return setMaskingPassword(function (prev) {
               return !prev;
             });
           },
           tabIndex: -1
         }, {
-          children: jsx(Icon, {
-            name: pwdVision ? ICONS.Eye_s16 : ICONS.EyeOff_s16,
+          children: jsx(Icon
+          // 현재 상태에 대한 아이콘이 아니라 어떻게 하고싶냐는 뜻의 아이콘이니까 반대로 되어있는게 맞다
+          , {
+            // 현재 상태에 대한 아이콘이 아니라 어떻게 하고싶냐는 뜻의 아이콘이니까 반대로 되어있는게 맞다
+            name: maskingPassword ? ICONS.Eye_s16 : ICONS.EyeOff_s16,
             color: "#bdbdbd"
           })
         })), endNode && jsx("div", __assign({
@@ -23242,45 +23245,9 @@ var noSpace = function noSpace(text) {
   return '';
 };
 
-// text char 하나씩 비교하는 경우 (띄워쓰기 무시, 검색할 때 띄워쓰기 무시해야함)
-var setHighlightTextOnDataExceptSpace = function setHighlightTextOnDataExceptSpace(data, targetKey, compareText, autoExcept) {
-  if (autoExcept === void 0) {
-    autoExcept = false;
-  }
-  var setHighlightIdx = function setHighlightIdx(dt) {
-    var pqi = 0;
-    var idx = [-1, -1];
-    for (var i = 0; i <= dt[targetKey].length; i += 1) {
-      if (dt[targetKey][i] !== ' ') {
-        if (pqi === compareText.length) {
-          idx[1] = i;
-          break;
-        }
-        if (dt[targetKey][i].toLowerCase() === compareText[pqi]) {
-          if (pqi === 0) {
-            idx[0] = i;
-          }
-          pqi += 1;
-        } else {
-          pqi = 0;
-        }
-      }
-    }
-    return idx;
-  };
+var searchData = function searchData(data, displayKey, query) {
   return data.reduce(function (acc, curr) {
-    var _a;
-    if (noSpace(curr[targetKey]).toLowerCase().includes(compareText)) {
-      var highlightIdx = setHighlightIdx(curr);
-      if (highlightIdx.every(function (el) {
-        return el !== -1;
-      })) {
-        var highlightText = "".concat(curr[targetKey].slice(0, highlightIdx[0]), "<em>").concat(curr[targetKey].slice(highlightIdx[0], highlightIdx[1]), "</em>").concat(curr[targetKey].slice(highlightIdx[1]));
-        acc.push(__assign(__assign({}, curr), (_a = {}, _a[targetKey] = highlightText, _a)));
-        return acc;
-      }
-    }
-    if (!autoExcept) {
+    if (noSpace(curr[displayKey]).toLowerCase().includes(query)) {
       acc.push(curr);
     }
     return acc;
@@ -23609,16 +23576,10 @@ function DropdownMenu(_a) {
               rowId: item[idKey]
             }, {
               children: jsx("span", {
-                className: "maru-dropdown-menu-item-span",
-                dangerouslySetInnerHTML: {
-                  __html: item[displayKey]
-                }
+                children: item[displayKey]
               })
             })) : jsx("span", {
-              className: "maru-dropdown-menu-item-span",
-              dangerouslySetInnerHTML: {
-                __html: item[displayKey]
-              }
+              children: item[displayKey]
             })
           }), "maru-dropdown-menu-item-".concat(item[idKey]));
         })
@@ -23708,7 +23669,7 @@ function Dropdown(_a) {
     if (type === 'input') {
       var pretreatedQeury = noSpace(inputValue).toLowerCase();
       if (pretreatedQeury !== '') {
-        setFilteredData(setHighlightTextOnDataExceptSpace(data, displayKey, pretreatedQeury));
+        setFilteredData(searchData(data, displayKey, pretreatedQeury));
       } else {
         initFilteredData();
       }

package/dist/utils/highlight.d.ts

@@ -1,3 +1 @@
-declare const setHighlightTextOnData: <T>(cb: (func: unknown) => void, data: T[], targetKey: string, compareText: string) => void;
-declare const setHighlightTextOnDataExceptSpace: <T>(data: T[], targetKey: string, compareText: string, autoExcept?: boolean) => typeof data;
-export { setHighlightTextOnData, setHighlightTextOnDataExceptSpace };
+export declare const searchData: <T>(data: T[], displayKey: string, query: string) => typeof data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maru_design2",
-  "version": "2.16.2",
+  "version": "2.16.4",
   "main": "./dist/index.js",
   "author": "zena-42maru",
   "license": "MIT",