ag-common 0.0.148 → 0.0.152

package/dist/ui/components/Prompt/index.js

@@ -85,7 +85,14 @@ const PromptModal = ({ wrapper, res, bottomText, topText, okText = 'OK', cancelT
             react_1.default.createElement(Content, null,
                 topText && react_1.default.createElement(TopText, null, topText),
                 react_1.default.createElement(BottomText, null, bottomText),
-                react_1.default.createElement(TextEdit_1.TextEdit, { defaultValue: text, onSubmit: (c) => setText(c), placeholder: placeholder, defaultEditing: { focus: true }, singleLine: true, noGrow: true }),
+                react_1.default.createElement(TextEdit_1.TextEdit, { defaultValue: text, onSubmit: (c, enter) => {
+                        if (enter) {
+                            ret(c);
+                        }
+                        else {
+                            setText(c);
+                        }
+                    }, placeholder: placeholder, defaultEditing: { focus: true }, singleLine: true, noGrow: true }),
                 react_1.default.createElement(Bottom, { noGrow: true },
                     react_1.default.createElement(Button_1.Button, { onClick: () => ret(text) }, okText),
                     react_1.default.createElement(Button_1.Button, { invert: true, onClick: () => ret(undefined) }, cancelText))))));

package/dist/ui/components/TextEdit/TextEdit.d.ts

@@ -14,7 +14,10 @@ export declare const TextEdit: ({ defaultValue, defaultEditing, onSubmit, disabl
     defaultEditing?: {
         focus: boolean;
     } | undefined;
-    onSubmit: (val: string) => void;
+    /**
+     * on submit.
+     */
+    onSubmit: (val: string, enterPressed: boolean) => void;
     disableEdit?: boolean | undefined;
     placeholder?: string | undefined;
     onEditingChange?: ((editing: boolean) => void) | undefined;

package/dist/ui/components/TextEdit/TextEdit.js

@@ -77,7 +77,7 @@ const TextEdit = ({ defaultValue, defaultEditing, onSubmit, disableEdit = false,
     const valueChange = value !== defaultValue;
     (0, useOnClickOutside_1.useOnClickOutside)({ ref, moveMouseOutside: false }, () => {
         if (valueChange) {
-            onSubmit(value);
+            onSubmit(value, false);
         }
         else {
             if (!disableEdit && editing && defaultEditing) {
@@ -126,9 +126,12 @@ const TextEdit = ({ defaultValue, defaultEditing, onSubmit, disableEdit = false,
     return (react_1.default.createElement(ValueBoxEdit, Object.assign({}, common_2.noDrag, { className: className, "data-editing": "true", 
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         ref: ref, tabIndex: editing ? 0 : undefined, "data-nogrow": noGrow }),
-        react_1.default.createElement(Comp, { "data-editing": "true", "data-valuechange": valueChange.toString(), ref: taref, "data-type": "text", value: value, onChange: (v) => setValue(v.currentTarget.value), placeholder: placeholder, rows: singleLine ? 1 : undefined, onKeyDown: (e) => singleLine && e.code.endsWith('Enter') && onSubmit(value) && false }),
+        react_1.default.createElement(Comp, { "data-editing": "true", "data-valuechange": valueChange.toString(), ref: taref, "data-type": "text", value: value, onChange: (v) => setValue(v.currentTarget.value), placeholder: placeholder, rows: singleLine ? 1 : undefined, onKeyDown: (e) => singleLine &&
+                e.code.endsWith('Enter') &&
+                onSubmit(value, true) &&
+                false }),
         react_1.default.createElement(Right, null,
-            valueChange && (react_1.default.createElement(Icon, { style: common_1.iconLeft, onClick: () => valueChange && onSubmit(value) },
+            valueChange && (react_1.default.createElement(Icon, { style: common_1.iconLeft, onClick: () => valueChange && onSubmit(value, false) },
                 react_1.default.createElement(images_1.SaveIcon, null))),
             (valueChange || editing !== !!defaultEditing) && (react_1.default.createElement(Icon, { style: common_1.iconRight, onClick: () => {
                     setEditing(!!defaultEditing);

package/dist/ui/helpers/routes.d.ts

@@ -67,7 +67,7 @@ export interface IStateCommon<TRequest extends IRequestCommon> extends IInitialS
  * @param param0
  * @returns
  */
-export declare const getClientOrServerReqHref: ({ href, query, }: {
+export declare const getClientOrServerReqHref: ({ href, query, forceServer, }: {
     /**
      * will use window if possible
      */
@@ -76,6 +76,28 @@ export declare const getClientOrServerReqHref: ({ href, query, }: {
      * pass in query string params
      */
     query?: Record<string, string> | undefined;
+    /**
+     * if true, wont use window location. default false
+     */
+    forceServer?: boolean | undefined;
+}) => LocationSubset;
+/**
+ * get server side parsed url
+ * @param param0 * @returns
+ */
+export declare const getServerReq: ({ host, pathname, query, }: {
+    /**
+     * eg ctx?.req?.headers?.host OR (user provided host eg test.com)
+     */
+    host: string;
+    /**
+     * eg ctx.asPath || '/'
+     */
+    pathname: string;
+    /**
+     * eg ctx.query
+     */
+    query: Record<string, string | string[] | undefined>;
 }) => LocationSubset;
 export interface INextCtx {
     req?: {
@@ -86,8 +108,3 @@ export interface INextCtx {
     asPath?: string;
     query: Record<string, string | string[] | undefined>;
 }
-/**
- * get parsed url from nextjs server host/pathname/query
- * @param param0 * @returns
- */
-export declare const getServerReq: (ctx: INextCtx) => LocationSubset | null;

package/dist/ui/helpers/routes.js

@@ -23,8 +23,8 @@ const calculateServerHref = ({ host, pathname, }) => {
  * @param param0
  * @returns
  */
-const getClientOrServerReqHref = ({ href, query, }) => {
-    if (typeof window !== 'undefined') {
+const getClientOrServerReqHref = ({ href, query, forceServer = false, }) => {
+    if (typeof window !== 'undefined' && !forceServer) {
         href = window.location.href;
     }
     if (!href) {
@@ -45,22 +45,22 @@ const getClientOrServerReqHref = ({ href, query, }) => {
 };
 exports.getClientOrServerReqHref = getClientOrServerReqHref;
 /**
- * get parsed url from nextjs server host/pathname/query
+ * get server side parsed url
  * @param param0 * @returns
  */
-const getServerReq = (ctx) => {
-    var _a, _b;
-    if (!((_b = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.req) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? void 0 : _b.host) || !(ctx === null || ctx === void 0 ? void 0 : ctx.asPath)) {
-        return null;
-    }
+const getServerReq = ({ host, pathname, query, }) => {
     const href = calculateServerHref({
-        host: ctx.req.headers.host,
-        pathname: ctx.asPath,
+        host,
+        pathname,
     });
-    const parsedQuery = !ctx.query || Object.keys(ctx.query).length === 0
+    const parsedQuery = !query || Object.keys(query).length === 0
         ? undefined
-        : (0, object_1.castStringlyObject)(ctx.query);
-    const ret = (0, exports.getClientOrServerReqHref)({ href, query: parsedQuery });
+        : (0, object_1.castStringlyObject)(query);
+    const ret = (0, exports.getClientOrServerReqHref)({
+        href,
+        query: parsedQuery,
+        forceServer: true,
+    });
     return ret;
 };
 exports.getServerReq = getServerReq;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.148",
+  "version": "0.0.152",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",