@sunggang/ui-lib 0.3.35 → 0.3.37

package/index.esm.css

@@ -574,35 +574,58 @@ video {
   color: hsl(var(--foreground));
     font-feature-settings: 'rlig' 1, 'calt' 1;
 }
+.\!container {
+  width: 100% !important;
+}
 .container {
   width: 100%;
 }
 @media (min-width: 640px) {
 
+  .\!container {
+    max-width: 640px !important;
+  }
+
   .container {
     max-width: 640px;
   }
 }
 @media (min-width: 768px) {
 
+  .\!container {
+    max-width: 768px !important;
+  }
+
   .container {
     max-width: 768px;
   }
 }
 @media (min-width: 1024px) {
 
+  .\!container {
+    max-width: 1024px !important;
+  }
+
   .container {
     max-width: 1024px;
   }
 }
 @media (min-width: 1280px) {
 
+  .\!container {
+    max-width: 1280px !important;
+  }
+
   .container {
     max-width: 1280px;
   }
 }
 @media (min-width: 1536px) {
 
+  .\!container {
+    max-width: 1536px !important;
+  }
+
   .container {
     max-width: 1536px;
   }
@@ -613,6 +636,9 @@ video {
 .pointer-events-auto {
   pointer-events: auto;
 }
+.\!visible {
+  visibility: visible !important;
+}
 .visible {
   visibility: visible;
 }
@@ -625,15 +651,24 @@ video {
 .static {
   position: static;
 }
+.\!fixed {
+  position: fixed !important;
+}
 .fixed {
   position: fixed;
 }
 .absolute {
   position: absolute;
 }
+.\!relative {
+  position: relative !important;
+}
 .relative {
   position: relative;
 }
+.sticky {
+  position: sticky;
+}
 .inset-0 {
   inset: 0px;
 }
@@ -696,6 +731,9 @@ video {
 .top-\[72px\] {
   top: 72px;
 }
+.isolate {
+  isolation: isolate;
+}
 .z-10 {
   z-index: 10;
 }
@@ -711,6 +749,9 @@ video {
 .z-\[9999\] {
   z-index: 9999;
 }
+.m-1 {
+  margin: 0.25rem;
+}
 .m-4 {
   margin: 1rem;
 }
@@ -795,6 +836,9 @@ video {
 .mt-5 {
   margin-top: 1.25rem;
 }
+.\!block {
+  display: block !important;
+}
 .block {
   display: block;
 }
@@ -810,12 +854,42 @@ video {
 .inline-flex {
   display: inline-flex;
 }
+.\!table {
+  display: table !important;
+}
 .table {
   display: table;
 }
+.inline-table {
+  display: inline-table;
+}
+.table-caption {
+  display: table-caption;
+}
+.table-cell {
+  display: table-cell;
+}
+.flow-root {
+  display: flow-root;
+}
+.\!grid {
+  display: grid !important;
+}
 .grid {
   display: grid;
 }
+.inline-grid {
+  display: inline-grid;
+}
+.\!contents {
+  display: contents !important;
+}
+.contents {
+  display: contents;
+}
+.list-item {
+  display: list-item;
+}
 .hidden {
   display: none;
 }
@@ -1029,9 +1103,18 @@ video {
 .flex-none {
   flex: none;
 }
+.flex-shrink {
+  flex-shrink: 1;
+}
+.shrink {
+  flex-shrink: 1;
+}
 .shrink-0 {
   flex-shrink: 0;
 }
+.flex-grow {
+  flex-grow: 1;
+}
 .grow {
   flex-grow: 1;
 }
@@ -1072,6 +1155,9 @@ video {
   --tw-rotate: 90deg;
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
+.\!transform {
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y)) !important;
+}
 .transform {
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
@@ -1098,6 +1184,11 @@ video {
      -moz-user-select: none;
           user-select: none;
 }
+.select-all {
+  -webkit-user-select: all;
+     -moz-user-select: all;
+          user-select: all;
+}
 .resize {
   resize: both;
 }
@@ -1322,6 +1413,9 @@ video {
 .border-\[\#ffffff33\] {
   border-color: #ffffff33;
 }
+.border-\[top\2c left\2c right\2c bottom\] {
+  border-color: top,left,right,bottom;
+}
 .border-gray-200 {
   --tw-border-opacity: 1;
   border-color: rgb(229 231 235 / var(--tw-border-opacity, 1));
@@ -1718,6 +1812,9 @@ video {
 .text-right {
   text-align: right;
 }
+.text-justify {
+  text-align: justify;
+}
 .indent-1 {
   text-indent: 0.25rem;
 }
@@ -1766,6 +1863,9 @@ video {
 .font-bold {
   font-weight: 700;
 }
+.font-light {
+  font-weight: 300;
+}
 .font-medium {
   font-weight: 500;
 }
@@ -1787,6 +1887,10 @@ video {
 .italic {
   font-style: italic;
 }
+.ordinal {
+  --tw-ordinal: ordinal;
+  font-variant-numeric: var(--tw-ordinal) var(--tw-slashed-zero) var(--tw-numeric-figure) var(--tw-numeric-spacing) var(--tw-numeric-fraction);
+}
 .tracking-tight {
   letter-spacing: -0.025em;
 }
@@ -1998,12 +2102,23 @@ video {
 .underline {
   text-decoration-line: underline;
 }
+.overline {
+  text-decoration-line: overline;
+}
 .line-through {
   text-decoration-line: line-through;
 }
 .underline-offset-4 {
   text-underline-offset: 4px;
 }
+.antialiased {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.subpixel-antialiased {
+  -webkit-font-smoothing: auto;
+  -moz-osx-font-smoothing: auto;
+}
 .opacity-0 {
   opacity: 0;
 }
@@ -2091,9 +2206,28 @@ video {
   --tw-drop-shadow: drop-shadow(0 1px 2px rgb(0 0 0 / 0.1)) drop-shadow(0 1px 1px rgb(0 0 0 / 0.06));
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }
+.grayscale {
+  --tw-grayscale: grayscale(100%);
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
+}
+.invert {
+  --tw-invert: invert(100%);
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
+}
+.sepia {
+  --tw-sepia: sepia(100%);
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
+}
+.\!filter {
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow) !important;
+}
 .filter {
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }
+.backdrop-filter {
+  -webkit-backdrop-filter: var(--tw-backdrop-blur) var(--tw-backdrop-brightness) var(--tw-backdrop-contrast) var(--tw-backdrop-grayscale) var(--tw-backdrop-hue-rotate) var(--tw-backdrop-invert) var(--tw-backdrop-opacity) var(--tw-backdrop-saturate) var(--tw-backdrop-sepia);
+  backdrop-filter: var(--tw-backdrop-blur) var(--tw-backdrop-brightness) var(--tw-backdrop-contrast) var(--tw-backdrop-grayscale) var(--tw-backdrop-hue-rotate) var(--tw-backdrop-invert) var(--tw-backdrop-opacity) var(--tw-backdrop-saturate) var(--tw-backdrop-sepia);
+}
 .transition {
   transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
   transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
@@ -2133,6 +2267,9 @@ video {
 .duration-500 {
   transition-duration: 500ms;
 }
+.ease-in {
+  transition-timing-function: cubic-bezier(0.4, 0, 1, 1);
+}
 .ease-in-out {
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 }
@@ -2153,6 +2290,12 @@ video {
     transform: translate3d(var(--tw-exit-translate-x, 0), var(--tw-exit-translate-y, 0), 0) scale3d(var(--tw-exit-scale, 1), var(--tw-exit-scale, 1), var(--tw-exit-scale, 1)) rotate(var(--tw-exit-rotate, 0));
   }
 }
+.zoom-in {
+  --tw-enter-scale: 0;
+}
+.zoom-out {
+  --tw-exit-scale: 0;
+}
 .duration-1000 {
   animation-duration: 1000ms;
 }
@@ -2165,12 +2308,57 @@ video {
 .duration-500 {
   animation-duration: 500ms;
 }
+.ease-in {
+  animation-timing-function: cubic-bezier(0.4, 0, 1, 1);
+}
 .ease-in-out {
   animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 }
 .ease-out {
   animation-timing-function: cubic-bezier(0, 0, 0.2, 1);
 }
+.\!running {
+  animation-play-state: running !important;
+}
+.running {
+  animation-play-state: running;
+}
+.paused {
+  animation-play-state: paused;
+}
+.\[a-zA-Z0-9\:\\\\-\\\\\._\$\] {
+  a-z-a--z0-9: \\-\\. $;
+}
+.\[hash\:base64\] {
+  hash: base64;
+}
+.\[key\:string\] {
+  key: string;
+}
+.\[module\:ckbox\/ckbox\~CKBoxConfig\#assetsOrigin\] {
+  module: ckbox/ckbox~CKBoxConfig#assetsOrigin;
+}
+.\[module\:ckbox\/ckbox\~CKBoxConfig\#defaultUploadCategories\] {
+  module: ckbox/ckbox~CKBoxConfig#defaultUploadCategories;
+}
+.\[module\:ckbox\/ckbox\~CKBoxConfig\#ignoreDataId\] {
+  module: ckbox/ckbox~CKBoxConfig#ignoreDataId;
+}
+.\[module\:ckbox\/ckbox\~CKBoxConfig\#language\] {
+  module: ckbox/ckbox~CKBoxConfig#language;
+}
+.\[module\:ckbox\/ckbox\~CKBoxConfig\#serviceOrigin\] {
+  module: ckbox/ckbox~CKBoxConfig#serviceOrigin;
+}
+.\[module\:media-embed\/mediaembed\~MediaEmbedConfig\#elementName\] {
+  module: media-embed/mediaembed~MediaEmbedConfig#elementName;
+}
+.\[module\:media-embed\/mediaembed\~MediaEmbedConfig\#previewsInData\=false\] {
+  module: media-embed/mediaembed~MediaEmbedConfig#previewsInData=false;
+}
+.\[module\:ui\/template\~TemplateBinding\#callback\] {
+  module: ui/template~TemplateBinding#callback;
+}
 
 /* gary */
 

package/index.esm2.js

@@ -47619,8 +47619,7 @@ var BaseTemplate = function(param) {
                     children: [
                         field.value && /*#__PURE__*/ jsx("div", {
                             className: "absolute -right-4 top-0",
-                            children: /*#__PURE__*/ jsx("button", {
-                                type: "button",
+                            children: /*#__PURE__*/ jsx("div", {
                                 onClick: function(e) {
                                     e.stopPropagation();
                                     field.onChange(null);
@@ -78338,13 +78337,14 @@ function _ts_generator(thisArg, body) {
 }
 var LiffContext = /*#__PURE__*/ createContext(undefined);
 var LiffProvider = function(param) {
-    var children = param.children, liffId = param.liffId, _param_localStorageKey = param.localStorageKey, localStorageKey = _param_localStorageKey === void 0 ? "one-gobo-global-login" : _param_localStorageKey, checkTokenUrl = param.checkTokenUrl, loginUrl = param.loginUrl, memberInfoUrl = param.memberInfoUrl, _param_openInApp = param.openInApp, openInApp = _param_openInApp === void 0 ? false : _param_openInApp, _param_ignoreCheckAddFriend = param.ignoreCheckAddFriend, ignoreCheckAddFriend = _param_ignoreCheckAddFriend === void 0 ? false : _param_ignoreCheckAddFriend; param.ignoreRoute; param.loginByUser; var customerRedirectUrl = param.customerRedirectUrl, inviteCode = param.inviteCode, handleLoginError = param.handleLoginError;
+    var children = param.children, liffId = param.liffId, _param_localStorageKey = param.localStorageKey, localStorageKey = _param_localStorageKey === void 0 ? "one-gobo-global-login" : _param_localStorageKey, checkTokenUrl = param.checkTokenUrl, loginUrl = param.loginUrl, accountLoginUrl = param.accountLoginUrl, memberInfoUrl = param.memberInfoUrl, _param_openInApp = param.openInApp, openInApp = _param_openInApp === void 0 ? false : _param_openInApp, _param_ignoreCheckAddFriend = param.ignoreCheckAddFriend, ignoreCheckAddFriend = _param_ignoreCheckAddFriend === void 0 ? false : _param_ignoreCheckAddFriend, _param_ignoreRoute = param.ignoreRoute, ignoreRoute = _param_ignoreRoute === void 0 ? false : _param_ignoreRoute, _param_loginByUser = param.loginByUser, loginByUser = _param_loginByUser === void 0 ? false : _param_loginByUser, customerRedirectUrl = param.customerRedirectUrl, inviteCode = param.inviteCode, handleLoginError = param.handleLoginError;
     var _useState = _sliced_to_array(useState(null), 2), liffObject = _useState[0], setLiffObject = _useState[1];
     var _useState1 = _sliced_to_array(useState(""), 2), accessToken = _useState1[0], setAccessToken = _useState1[1];
     var _useState2 = _sliced_to_array(useState(null), 2), liffError = _useState2[0], setLiffError = _useState2[1];
     var _useState3 = _sliced_to_array(useState(null), 2), loginData = _useState3[0], setLoginData = _useState3[1];
     var _useState4 = _sliced_to_array(useState(null), 2), userInfo = _useState4[0], setUserInfo = _useState4[1];
     var _useState5 = _sliced_to_array(useState(null), 2), isFriendship = _useState5[0], setFriendship = _useState5[1];
+    var _useState6 = _sliced_to_array(useState(null), 2), loginType = _useState6[0], setLoginType = _useState6[1];
     var fetchMemberInfo = function() {
         var _ref = _async_to_generator(function(token) {
             var response, err;
@@ -78492,6 +78492,7 @@ var LiffProvider = function(param) {
                         loginToken = resData === null || resData === void 0 ? void 0 : (_resData_data1 = resData.data) === null || _resData_data1 === void 0 ? void 0 : _resData_data1.access_token;
                         if (loginToken) {
                             setAccessToken(loginToken);
+                            setLoginType("line");
                             if (memberInfoUrl) fetchMemberInfo(loginToken);
                         } else {
                             setUserInfo(response);
@@ -78522,7 +78523,7 @@ var LiffProvider = function(param) {
     // 初始化 LIFF
     var initializeLiff = function() {
         var _ref = _async_to_generator(function(isValid) {
-            var customFetch, liff, originalFetch, lineToken, urlParams, liffState, currentPath, origin, redirectUri, tempFriendship, friendship, friendFlag, error, err;
+            var customFetch, liff, originalFetch, lineToken, redirectUri, tempFriendship, friendship, friendFlag, error, err;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -78561,19 +78562,12 @@ var LiffProvider = function(param) {
                         console.log("LIFF init succeeded.");
                         setLiffObject(liff);
                         lineToken = liff === null || liff === void 0 ? void 0 : liff.getAccessToken();
-                        if (liff.isLoggedIn()) {
-                            // 檢查是否有 liff.state 參數
-                            urlParams = new URLSearchParams(window.location.search);
-                            liffState = urlParams.get("liff.state");
-                            if (liffState) {
-                                // 重定向到原始頁面
-                                window.location.replace(decodeURIComponent(liffState));
-                            }
-                        } else {
-                            // 處理登入邏輯
-                            currentPath = customerRedirectUrl || window.location.pathname + window.location.search || "";
-                            origin = window.location.origin;
-                            redirectUri = "".concat(origin).concat(currentPath);
+                        // 未登入先進行登入
+                        if (!liff.isLoggedIn()) {
+                            redirectUri = customerRedirectUrl || "".concat(window.location.href);
+                            if (loginByUser || ignoreRoute) return [
+                                2
+                            ];
                             liff.login({
                                 redirectUri: redirectUri
                             });
@@ -78648,6 +78642,74 @@ var LiffProvider = function(param) {
             return _ref.apply(this, arguments);
         };
     }();
+    var accountLogin = function() {
+        var _ref = _async_to_generator(function(username, password) {
+            var response, _response_data, _response_data1, token, tokenType, finalToken, err;
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        _state.trys.push([
+                            0,
+                            4,
+                            ,
+                            5
+                        ]);
+                        return [
+                            4,
+                            fetchAPI(accountLoginUrl || "", {
+                                method: "POST",
+                                body: {
+                                    username: username,
+                                    password: password
+                                }
+                            })
+                        ];
+                    case 1:
+                        response = _state.sent();
+                        if (!(response === null || response === void 0 ? void 0 : response.status)) return [
+                            3,
+                            3
+                        ];
+                        token = response === null || response === void 0 ? void 0 : (_response_data = response.data) === null || _response_data === void 0 ? void 0 : _response_data.access_token;
+                        tokenType = response === null || response === void 0 ? void 0 : (_response_data1 = response.data) === null || _response_data1 === void 0 ? void 0 : _response_data1.token_type;
+                        finalToken = "".concat(tokenType, " ").concat(token);
+                        setAccessToken(finalToken);
+                        setLoginType("account");
+                        window.localStorage.setItem(localStorageKey, JSON.stringify(response));
+                        if (!token) return [
+                            3,
+                            3
+                        ];
+                        return [
+                            4,
+                            fetchMemberInfo(finalToken)
+                        ];
+                    case 2:
+                        _state.sent();
+                        _state.label = 3;
+                    case 3:
+                        return [
+                            2,
+                            response
+                        ];
+                    case 4:
+                        err = _state.sent();
+                        console.error("帳密登入失敗:", err);
+                        return [
+                            2,
+                            null
+                        ];
+                    case 5:
+                        return [
+                            2
+                        ];
+                }
+            });
+        });
+        return function accountLogin(username, password) {
+            return _ref.apply(this, arguments);
+        };
+    }();
     var ensureLiffTokenValid = useCallback$1(/*#__PURE__*/ _async_to_generator(function() {
         var _parsedStore_data, _parsedStore_state, jwtTokenValue, jwtToken, parsedStore, isValid, _tmp, err;
         return _ts_generator(this, function(_state) {
@@ -78797,7 +78859,9 @@ var LiffProvider = function(param) {
                 return initializeLiff(false);
             },
             isFriendship: isFriendship,
-            ensureLiffTokenValid: ensureLiffTokenValid
+            ensureLiffTokenValid: ensureLiffTokenValid,
+            accountLogin: accountLogin,
+            loginType: loginType
         };
     }, [
         liffObject,
@@ -78806,7 +78870,9 @@ var LiffProvider = function(param) {
         accessToken,
         liffError,
         isFriendship,
-        ensureLiffTokenValid
+        ensureLiffTokenValid,
+        accountLogin,
+        loginType
     ]);
     return /*#__PURE__*/ jsx(LiffContext.Provider, {
         value: contextValue,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sunggang/ui-lib",
-  "version": "0.3.35",
+  "version": "0.3.37",
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",

package/src/lib/Provider/LiffProvider.d.ts

@@ -8,14 +8,17 @@ type LiffContextType = {
     initializeLiff: () => Promise<void>;
     isFriendship: boolean | null;
     ensureLiffTokenValid: () => Promise<boolean>;
+    loginType: string | null;
+    accountLogin: (username: string, password: string) => Promise<void>;
 };
 export declare const LiffContext: React.Context<LiffContextType | undefined>;
-export declare const LiffProvider: ({ children, liffId, localStorageKey, checkTokenUrl, loginUrl, memberInfoUrl, openInApp, ignoreCheckAddFriend, ignoreRoute, loginByUser, customerRedirectUrl, inviteCode, handleLoginError, }: {
+export declare const LiffProvider: ({ children, liffId, localStorageKey, checkTokenUrl, loginUrl, accountLoginUrl, memberInfoUrl, openInApp, ignoreCheckAddFriend, ignoreRoute, loginByUser, customerRedirectUrl, inviteCode, handleLoginError, }: {
     children: React.ReactNode;
     liffId: string;
     localStorageKey: string;
     checkTokenUrl: string;
     loginUrl?: string | undefined;
+    accountLoginUrl?: string | undefined;
     memberInfoUrl: string;
     openInApp?: boolean | undefined;
     ignoreCheckAddFriend?: boolean | undefined;