@redneckz/wildless-cms-uni-blocks 0.14.769 → 0.14.771

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.
Files changed (47) hide show
  1. package/bundle/bundle.umd.js +13 -24
  2. package/bundle/bundle.umd.min.js +1 -1
  3. package/bundle/utils/url.d.ts +2 -2
  4. package/dist/ui-kit/Button/SubmitButton.js +2 -1
  5. package/dist/ui-kit/Button/SubmitButton.js.map +1 -1
  6. package/dist/utils/url.d.ts +2 -2
  7. package/dist/utils/url.js +10 -2
  8. package/dist/utils/url.js.map +1 -1
  9. package/lib/ui-kit/Button/SubmitButton.js +2 -1
  10. package/lib/ui-kit/Button/SubmitButton.js.map +1 -1
  11. package/lib/utils/url.d.ts +2 -2
  12. package/lib/utils/url.js +9 -1
  13. package/lib/utils/url.js.map +1 -1
  14. package/mobile/bundle/bundle.umd.js +13 -24
  15. package/mobile/bundle/bundle.umd.min.js +1 -1
  16. package/mobile/bundle/utils/url.d.ts +2 -2
  17. package/mobile/dist/ui-kit/Button/SubmitButton.js +2 -1
  18. package/mobile/dist/ui-kit/Button/SubmitButton.js.map +1 -1
  19. package/mobile/dist/utils/url.d.ts +2 -2
  20. package/mobile/dist/utils/url.js +10 -2
  21. package/mobile/dist/utils/url.js.map +1 -1
  22. package/mobile/lib/ui-kit/Button/SubmitButton.js +2 -1
  23. package/mobile/lib/ui-kit/Button/SubmitButton.js.map +1 -1
  24. package/mobile/lib/utils/url.d.ts +2 -2
  25. package/mobile/lib/utils/url.js +9 -1
  26. package/mobile/lib/utils/url.js.map +1 -1
  27. package/mobile/src/ui-kit/Button/SubmitButton.tsx +14 -6
  28. package/mobile/src/utils/url.ts +11 -2
  29. package/package.json +1 -1
  30. package/src/ui-kit/Button/SubmitButton.tsx +14 -6
  31. package/src/utils/url.ts +11 -2
  32. package/bundle/utils/joinPath.d.ts +0 -2
  33. package/dist/utils/joinPath.d.ts +0 -2
  34. package/dist/utils/joinPath.js +0 -24
  35. package/dist/utils/joinPath.js.map +0 -1
  36. package/lib/utils/joinPath.d.ts +0 -2
  37. package/lib/utils/joinPath.js +0 -20
  38. package/lib/utils/joinPath.js.map +0 -1
  39. package/mobile/bundle/utils/joinPath.d.ts +0 -2
  40. package/mobile/dist/utils/joinPath.d.ts +0 -2
  41. package/mobile/dist/utils/joinPath.js +0 -24
  42. package/mobile/dist/utils/joinPath.js.map +0 -1
  43. package/mobile/lib/utils/joinPath.d.ts +0 -2
  44. package/mobile/lib/utils/joinPath.js +0 -20
  45. package/mobile/lib/utils/joinPath.js.map +0 -1
  46. package/mobile/src/utils/joinPath.ts +0 -24
  47. package/src/utils/joinPath.ts +0 -24
@@ -1,7 +1,7 @@
1
1
  import { type Target } from '../model/LinkProps';
2
- export declare const isURL: (href: string | undefined | null) => href is `${string}:${string}`;
2
+ export declare const isURL: (href: string | undefined) => href is `${string}:${string}`;
3
3
  export declare const isLocalURL: (href: string | undefined, target?: Target) => boolean;
4
4
  export declare const isHash: (href: string | undefined) => href is `#${string}`;
5
5
  export declare const withoutQuery: (href: string | undefined) => string;
6
- export { joinPath } from './joinPath';
6
+ export declare const joinPath: (...path: (string | undefined | null)[]) => string;
7
7
  export declare const hasPrefix: (href?: string) => (prefix?: string) => boolean;
@@ -2,7 +2,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
2
2
  exports.SubmitButton = void 0;
3
3
  const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
4
4
  const uni_jsx_1 = require("@redneckz/uni-jsx");
5
+ const style_1 = require("../../utils/style");
5
6
  const Loader_1 = require("../Loader/Loader");
6
7
  const Button_1 = require("./Button");
7
- exports.SubmitButton = (0, uni_jsx_1.JSX)(({ isLoading, disabled, children, ...rest }) => ((0, jsx_runtime_1.jsxs)(Button_1.Button, { type: "submit", disabled: isLoading || disabled, ...rest, children: [isLoading ? (0, jsx_runtime_1.jsx)(Loader_1.Loader, { blur: true, size: "small" }) : null, children] })));
8
+ exports.SubmitButton = (0, uni_jsx_1.JSX)(({ isLoading, disabled, children, className, ...rest }) => ((0, jsx_runtime_1.jsxs)(Button_1.Button, { type: "submit", className: (0, style_1.style)('relative', className), disabled: isLoading || disabled, ...rest, children: [isLoading ? (0, jsx_runtime_1.jsx)(Loader_1.Loader, { blur: true, size: "small" }) : null, children] })));
8
9
  //# sourceMappingURL=SubmitButton.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"SubmitButton.js","sourceRoot":"","sources":["../../../src/ui-kit/Button/SubmitButton.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,6CAA0C;AAC1C,qCAAoD;AAMvC,QAAA,YAAY,GAAG,IAAA,aAAG,EAAoB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,CACjG,wBAAC,eAAM,IAAC,IAAI,EAAC,QAAQ,EAAC,QAAQ,EAAE,SAAS,IAAI,QAAQ,KAAM,IAAI,aAC5D,SAAS,CAAC,CAAC,CAAC,uBAAC,eAAM,IAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,EACtD,QAAQ,IACF,CACV,CAAC,CAAC"}
1
+ {"version":3,"file":"SubmitButton.js","sourceRoot":"","sources":["../../../src/ui-kit/Button/SubmitButton.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,6CAA0C;AAC1C,6CAA0C;AAC1C,qCAAoD;AAMvC,QAAA,YAAY,GAAG,IAAA,aAAG,EAC7B,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,CACzD,wBAAC,eAAM,IACL,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,IAAA,aAAK,EAAC,UAAU,EAAE,SAAS,CAAC,EACvC,QAAQ,EAAE,SAAS,IAAI,QAAQ,KAC3B,IAAI,aAEP,SAAS,CAAC,CAAC,CAAC,uBAAC,eAAM,IAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,EACtD,QAAQ,IACF,CACV,CACF,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import { type Target } from '../model/LinkProps';
2
- export declare const isURL: (href: string | undefined | null) => href is `${string}:${string}`;
2
+ export declare const isURL: (href: string | undefined) => href is `${string}:${string}`;
3
3
  export declare const isLocalURL: (href: string | undefined, target?: Target) => boolean;
4
4
  export declare const isHash: (href: string | undefined) => href is `#${string}`;
5
5
  export declare const withoutQuery: (href: string | undefined) => string;
6
- export { joinPath } from './joinPath';
6
+ export declare const joinPath: (...path: (string | undefined | null)[]) => string;
7
7
  export declare const hasPrefix: (href?: string) => (prefix?: string) => boolean;
package/dist/utils/url.js CHANGED
@@ -8,8 +8,16 @@ const isHash = (href) => Boolean(href?.startsWith('#'));
8
8
  exports.isHash = isHash;
9
9
  const withoutQuery = (href) => (href ?? '').replace(/\?.*/, '').replace(/\/$/, '');
10
10
  exports.withoutQuery = withoutQuery;
11
- var joinPath_1 = require("./joinPath");
12
- Object.defineProperty(exports, "joinPath", { enumerable: true, get: function () { return joinPath_1.joinPath; } });
11
+ const joinPath = (...path) => path
12
+ .filter(Boolean)
13
+ .join('/')
14
+ .replace(/\/+/g, '/')
15
+ .replace(/^(.+):\//, '$1://') // TODO Череда очень странных преобрвзований
16
+ .replace(/^file:/, 'file:/')
17
+ .replace(/\/(\?|&|#[^!])/g, '$1')
18
+ .replace(/\?/g, '&')
19
+ .replace('&', '?');
20
+ exports.joinPath = joinPath;
13
21
  const hasPrefix = (href) => (prefix) => Boolean(href &&
14
22
  prefix &&
15
23
  href.startsWith(prefix) &&
@@ -1 +1 @@
1
- {"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAEO,MAAM,KAAK,GAAG,CAAC,IAA+B,EAAiC,EAAE,CACtF,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AADlB,QAAA,KAAK,SACa;AAExB,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AADtD,QAAA,UAAU,cAC4C;AAE5D,MAAM,MAAM,GAAG,CAAC,IAAwB,EAAwB,EAAE,CACvE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AADpB,QAAA,MAAM,UACc;AAE1B,MAAM,YAAY,GAAG,CAAC,IAAwB,EAAU,EAAE,CAC/D,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AADzC,QAAA,YAAY,gBAC6B;AAEtD,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AAEV,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,EAAE,CAC9D,OAAO,CACL,IAAI;IACF,MAAM;IACN,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACvB,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CACrE,CAAC;AANS,QAAA,SAAS,aAMlB"}
1
+ {"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAEO,MAAM,KAAK,GAAG,CAAC,IAAwB,EAAiC,EAAE,CAC/E,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AADlB,QAAA,KAAK,SACa;AAExB,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AADtD,QAAA,UAAU,cAC4C;AAE5D,MAAM,MAAM,GAAG,CAAC,IAAwB,EAAwB,EAAE,CACvE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AADpB,QAAA,MAAM,UACc;AAE1B,MAAM,YAAY,GAAG,CAAC,IAAwB,EAAU,EAAE,CAC/D,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AADzC,QAAA,YAAY,gBAC6B;AAE/C,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE,CACzE,IAAI;KACD,MAAM,CAAC,OAAO,CAAC;KACf,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;KACpB,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,4CAA4C;KACzE,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAC3B,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;KAChC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;KACnB,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AATV,QAAA,QAAQ,YASE;AAEhB,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,EAAE,CAC9D,OAAO,CACL,IAAI;IACF,MAAM;IACN,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACvB,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CACrE,CAAC;AANS,QAAA,SAAS,aAMlB"}
@@ -1,6 +1,7 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
2
2
  import { JSX } from '@redneckz/uni-jsx';
3
+ import { style } from '../../utils/style.js';
3
4
  import { Loader } from '../Loader/Loader.js';
4
5
  import { Button } from './Button.js';
5
- export const SubmitButton = JSX(({ isLoading, disabled, children, ...rest }) => (_jsxs(Button, { type: "submit", disabled: isLoading || disabled, ...rest, children: [isLoading ? _jsx(Loader, { blur: true, size: "small" }) : null, children] })));
6
+ export const SubmitButton = JSX(({ isLoading, disabled, children, className, ...rest }) => (_jsxs(Button, { type: "submit", className: style('relative', className), disabled: isLoading || disabled, ...rest, children: [isLoading ? _jsx(Loader, { blur: true, size: "small" }) : null, children] })));
6
7
  //# sourceMappingURL=SubmitButton.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"SubmitButton.js","sourceRoot":"","sources":["../../../src/ui-kit/Button/SubmitButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAoB,MAAM,UAAU,CAAC;AAMpD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAoB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,CACjG,MAAC,MAAM,IAAC,IAAI,EAAC,QAAQ,EAAC,QAAQ,EAAE,SAAS,IAAI,QAAQ,KAAM,IAAI,aAC5D,SAAS,CAAC,CAAC,CAAC,KAAC,MAAM,IAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,EACtD,QAAQ,IACF,CACV,CAAC,CAAC"}
1
+ {"version":3,"file":"SubmitButton.js","sourceRoot":"","sources":["../../../src/ui-kit/Button/SubmitButton.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAoB,MAAM,UAAU,CAAC;AAMpD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,CACzD,MAAC,MAAM,IACL,IAAI,EAAC,QAAQ,EACb,SAAS,EAAE,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,EACvC,QAAQ,EAAE,SAAS,IAAI,QAAQ,KAC3B,IAAI,aAEP,SAAS,CAAC,CAAC,CAAC,KAAC,MAAM,IAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,EACtD,QAAQ,IACF,CACV,CACF,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import { type Target } from '../model/LinkProps';
2
- export declare const isURL: (href: string | undefined | null) => href is `${string}:${string}`;
2
+ export declare const isURL: (href: string | undefined) => href is `${string}:${string}`;
3
3
  export declare const isLocalURL: (href: string | undefined, target?: Target) => boolean;
4
4
  export declare const isHash: (href: string | undefined) => href is `#${string}`;
5
5
  export declare const withoutQuery: (href: string | undefined) => string;
6
- export { joinPath } from './joinPath';
6
+ export declare const joinPath: (...path: (string | undefined | null)[]) => string;
7
7
  export declare const hasPrefix: (href?: string) => (prefix?: string) => boolean;
package/lib/utils/url.js CHANGED
@@ -2,7 +2,15 @@ export const isURL = (href) => Boolean(href?.includes(':'));
2
2
  export const isLocalURL = (href, target) => Boolean(href && !isURL(href) && (!target || target === '_self'));
3
3
  export const isHash = (href) => Boolean(href?.startsWith('#'));
4
4
  export const withoutQuery = (href) => (href ?? '').replace(/\?.*/, '').replace(/\/$/, '');
5
- export { joinPath } from './joinPath.js';
5
+ export const joinPath = (...path) => path
6
+ .filter(Boolean)
7
+ .join('/')
8
+ .replace(/\/+/g, '/')
9
+ .replace(/^(.+):\//, '$1://') // TODO Череда очень странных преобрвзований
10
+ .replace(/^file:/, 'file:/')
11
+ .replace(/\/(\?|&|#[^!])/g, '$1')
12
+ .replace(/\?/g, '&')
13
+ .replace('&', '?');
6
14
  export const hasPrefix = (href) => (prefix) => Boolean(href &&
7
15
  prefix &&
8
16
  href.startsWith(prefix) &&
@@ -1 +1 @@
1
- {"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAA+B,EAAiC,EAAE,CACtF,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAwB,EAAwB,EAAE,CACvE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAwB,EAAU,EAAE,CAC/D,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,EAAE,CAC9D,OAAO,CACL,IAAI;IACF,MAAM;IACN,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACvB,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CACrE,CAAC"}
1
+ {"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAwB,EAAiC,EAAE,CAC/E,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAwB,EAAwB,EAAE,CACvE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAwB,EAAU,EAAE,CAC/D,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAEtD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE,CACzE,IAAI;KACD,MAAM,CAAC,OAAO,CAAC;KACf,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;KACpB,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,4CAA4C;KACzE,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAC3B,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;KAChC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;KACnB,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAEvB,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,EAAE,CAC9D,OAAO,CACL,IAAI;IACF,MAAM;IACN,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACvB,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CACrE,CAAC"}
@@ -239,30 +239,19 @@
239
239
  return /^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}(\/revs\/[0-9]{1,20})?$/.test(src);
240
240
  };
241
241
 
242
- const PLACEHOLDER = 'http://_';
243
- const joinPath = (...path) => {
244
- const urls = path.filter(Boolean).map((_) => new URL(_, PLACEHOLDER));
245
- const origin = urls.find((_) => _.origin !== PLACEHOLDER)?.origin;
246
- const pathname = cleanPath(urls.map((_) => _.pathname));
247
- const query = joinSearchParams(...urls.map((_) => _.searchParams)).toString();
248
- const hash = urls.find((_) => _.hash)?.hash;
249
- return [origin, pathname, query ? `?${query}` : '', hash].filter(Boolean).join('');
250
- };
251
- const joinSearchParams = (...list) => {
252
- const result = new URLSearchParams();
253
- for (const searchParams of list) {
254
- for (const [k, v] of searchParams) {
255
- result.set(k, v);
256
- }
257
- }
258
- return result;
259
- };
260
- const cleanPath = (pathParts) => pathParts.join('/').replace(/\/+/g, '/');
261
-
262
242
  const isURL = (href) => Boolean(href?.includes(':'));
263
243
  const isLocalURL = (href, target) => Boolean(href && !isURL(href) && (!target || target === '_self'));
264
244
  const isHash = (href) => Boolean(href?.startsWith('#'));
265
245
  const withoutQuery = (href) => (href ?? '').replace(/\?.*/, '').replace(/\/$/, '');
246
+ const joinPath = (...path) => path
247
+ .filter(Boolean)
248
+ .join('/')
249
+ .replace(/\/+/g, '/')
250
+ .replace(/^(.+):\//, '$1://') // TODO Череда очень странных преобрвзований
251
+ .replace(/^file:/, 'file:/')
252
+ .replace(/\/(\?|&|#[^!])/g, '$1')
253
+ .replace(/\?/g, '&')
254
+ .replace('&', '?');
266
255
  const hasPrefix = (href) => (prefix) => Boolean(href &&
267
256
  prefix &&
268
257
  href.startsWith(prefix) &&
@@ -274,8 +263,8 @@
274
263
  isLocalURL: isLocalURL,
275
264
  isHash: isHash,
276
265
  withoutQuery: withoutQuery,
277
- hasPrefix: hasPrefix,
278
- joinPath: joinPath
266
+ joinPath: joinPath,
267
+ hasPrefix: hasPrefix
279
268
  });
280
269
 
281
270
  const API_PREFIX = '/api/';
@@ -2377,7 +2366,7 @@
2377
2366
  'backdrop-blur': blur,
2378
2367
  }), children: jsx("div", { className: style('inline-block', 'animate-spin rounded-full', 'border-solid border-current', 'border-r-transparent', size === 'small' ? 'border-4 h-8 w-8' : 'border-8 h-28 w-28', color), role: "status" }) })));
2379
2368
 
2380
- const SubmitButton = JSX(({ isLoading, disabled, children, ...rest }) => (jsxs(Button, { type: "submit", disabled: isLoading || disabled, ...rest, children: [isLoading ? jsx(Loader, { blur: true, size: "small" }) : null, children] })));
2369
+ const SubmitButton = JSX(({ isLoading, disabled, children, className, ...rest }) => (jsxs(Button, { type: "submit", className: style('relative', className), disabled: isLoading || disabled, ...rest, children: [isLoading ? jsx(Loader, { blur: true, size: "small" }) : null, children] })));
2381
2370
 
2382
2371
  const themeStyle = {
2383
2372
  primary: themeStyle$1.primary,
@@ -6637,7 +6626,7 @@
6637
6626
  slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
6638
6627
  });
6639
6628
 
6640
- const packageVersion = "0.14.768";
6629
+ const packageVersion = "0.14.770";
6641
6630
 
6642
6631
  exports.Blocks = Blocks;
6643
6632
  exports.ContentPage = ContentPage;