ag-common 0.0.149 → 0.0.153

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -50,7 +50,7 @@ const SItems = styled_components_1.default.div `
50
50
  max-height: ${maxHeight};
51
51
  `}
52
52
 
53
- overflow-y: scroll;
53
+ overflow-y: auto;
54
54
  ${({ open }) => open &&
55
55
  (0, styled_components_1.css) `
56
56
  display: flex;
@@ -85,7 +85,14 @@ const PromptModal = ({ wrapper, res, bottomText, topText, okText = 'OK', cancelT
85
85
  react_1.default.createElement(Content, null,
86
86
  topText && react_1.default.createElement(TopText, null, topText),
87
87
  react_1.default.createElement(BottomText, null, bottomText),
88
- react_1.default.createElement(TextEdit_1.TextEdit, { defaultValue: text, onSubmit: (c) => setText(c), placeholder: placeholder, defaultEditing: { focus: true }, singleLine: true, noGrow: true }),
88
+ react_1.default.createElement(TextEdit_1.TextEdit, { defaultValue: text, onSubmit: (c, enter) => {
89
+ if (enter) {
90
+ ret(c);
91
+ }
92
+ else {
93
+ setText(c);
94
+ }
95
+ }, placeholder: placeholder, defaultEditing: { focus: true }, singleLine: true, noGrow: true }),
89
96
  react_1.default.createElement(Bottom, { noGrow: true },
90
97
  react_1.default.createElement(Button_1.Button, { onClick: () => ret(text) }, okText),
91
98
  react_1.default.createElement(Button_1.Button, { invert: true, onClick: () => ret(undefined) }, cancelText))))));
@@ -14,7 +14,10 @@ export declare const TextEdit: ({ defaultValue, defaultEditing, onSubmit, disabl
14
14
  defaultEditing?: {
15
15
  focus: boolean;
16
16
  } | undefined;
17
- onSubmit: (val: string) => void;
17
+ /**
18
+ * on submit.
19
+ */
20
+ onSubmit: (val: string, enterPressed: boolean) => void;
18
21
  disableEdit?: boolean | undefined;
19
22
  placeholder?: string | undefined;
20
23
  onEditingChange?: ((editing: boolean) => void) | undefined;
@@ -77,7 +77,7 @@ const TextEdit = ({ defaultValue, defaultEditing, onSubmit, disableEdit = false,
77
77
  const valueChange = value !== defaultValue;
78
78
  (0, useOnClickOutside_1.useOnClickOutside)({ ref, moveMouseOutside: false }, () => {
79
79
  if (valueChange) {
80
- onSubmit(value);
80
+ onSubmit(value, false);
81
81
  }
82
82
  else {
83
83
  if (!disableEdit && editing && defaultEditing) {
@@ -126,9 +126,12 @@ const TextEdit = ({ defaultValue, defaultEditing, onSubmit, disableEdit = false,
126
126
  return (react_1.default.createElement(ValueBoxEdit, Object.assign({}, common_2.noDrag, { className: className, "data-editing": "true",
127
127
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
128
128
  ref: ref, tabIndex: editing ? 0 : undefined, "data-nogrow": noGrow }),
129
- 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 }),
129
+ 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 &&
130
+ e.code.endsWith('Enter') &&
131
+ onSubmit(value, true) &&
132
+ false }),
130
133
  react_1.default.createElement(Right, null,
131
- valueChange && (react_1.default.createElement(Icon, { style: common_1.iconLeft, onClick: () => valueChange && onSubmit(value) },
134
+ valueChange && (react_1.default.createElement(Icon, { style: common_1.iconLeft, onClick: () => valueChange && onSubmit(value, false) },
132
135
  react_1.default.createElement(images_1.SaveIcon, null))),
133
136
  (valueChange || editing !== !!defaultEditing) && (react_1.default.createElement(Icon, { style: common_1.iconRight, onClick: () => {
134
137
  setEditing(!!defaultEditing);
@@ -67,7 +67,7 @@ export interface IStateCommon<TRequest extends IRequestCommon> extends IInitialS
67
67
  * @param param0
68
68
  * @returns
69
69
  */
70
- export declare const getClientOrServerReqHref: ({ href, query, }: {
70
+ export declare const getClientOrServerReqHref: ({ href, query, forceServer, }: {
71
71
  /**
72
72
  * will use window if possible
73
73
  */
@@ -76,6 +76,10 @@ export declare const getClientOrServerReqHref: ({ href, query, }: {
76
76
  * pass in query string params
77
77
  */
78
78
  query?: Record<string, string> | undefined;
79
+ /**
80
+ * if true, wont use window location. default false
81
+ */
82
+ forceServer?: boolean | undefined;
79
83
  }) => LocationSubset;
80
84
  /**
81
85
  * get server side parsed url
@@ -83,7 +87,7 @@ export declare const getClientOrServerReqHref: ({ href, query, }: {
83
87
  */
84
88
  export declare const getServerReq: ({ host, pathname, query, }: {
85
89
  /**
86
- * eg ctx?.req?.headers?.host
90
+ * eg ctx?.req?.headers?.host OR (user provided host eg test.com)
87
91
  */
88
92
  host: string;
89
93
  /**
@@ -104,4 +108,3 @@ export interface INextCtx {
104
108
  asPath?: string;
105
109
  query: Record<string, string | string[] | undefined>;
106
110
  }
107
- export declare const getServerReqNextJs: (ctx: INextCtx) => LocationSubset | null;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getServerReqNextJs = exports.getServerReq = exports.getClientOrServerReqHref = void 0;
3
+ exports.getServerReq = exports.getClientOrServerReqHref = void 0;
4
4
  const url_1 = require("url");
5
5
  const string_1 = require("../../common/helpers/string");
6
6
  const object_1 = require("../../common/helpers/object");
@@ -23,8 +23,8 @@ const calculateServerHref = ({ host, pathname, }) => {
23
23
  * @param param0
24
24
  * @returns
25
25
  */
26
- const getClientOrServerReqHref = ({ href, query, }) => {
27
- if (typeof window !== 'undefined') {
26
+ const getClientOrServerReqHref = ({ href, query, forceServer = false, }) => {
27
+ if (typeof window !== 'undefined' && !forceServer) {
28
28
  href = window.location.href;
29
29
  }
30
30
  if (!href) {
@@ -56,17 +56,11 @@ const getServerReq = ({ host, pathname, query, }) => {
56
56
  const parsedQuery = !query || Object.keys(query).length === 0
57
57
  ? undefined
58
58
  : (0, object_1.castStringlyObject)(query);
59
- const ret = (0, exports.getClientOrServerReqHref)({ href, query: parsedQuery });
59
+ const ret = (0, exports.getClientOrServerReqHref)({
60
+ href,
61
+ query: parsedQuery,
62
+ forceServer: true,
63
+ });
60
64
  return ret;
61
65
  };
62
66
  exports.getServerReq = getServerReq;
63
- const getServerReqNextJs = (ctx) => {
64
- var _a, _b;
65
- const host = (_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;
66
- const pathname = ctx === null || ctx === void 0 ? void 0 : ctx.asPath;
67
- if (!host || !pathname) {
68
- return null;
69
- }
70
- return (0, exports.getServerReq)({ host, pathname, query: ctx.query });
71
- };
72
- exports.getServerReqNextJs = getServerReqNextJs;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ag-common",
3
- "version": "0.0.149",
3
+ "version": "0.0.153",
4
4
  "main": "./dist/index.js",
5
5
  "types": "./dist/index.d.ts",
6
6
  "author": "Andrei Gec <@andreigec> (https://gec.dev/)",