@typed/ui 0.3.8 → 0.4.0
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.
- package/dist/cjs/Link.js +11 -9
- package/dist/cjs/Link.js.map +1 -1
- package/dist/dts/Link.d.ts +1 -0
- package/dist/dts/Link.d.ts.map +1 -1
- package/dist/esm/Link.js +10 -5
- package/dist/esm/Link.js.map +1 -1
- package/package.json +9 -9
- package/src/Link.ts +12 -6
package/dist/cjs/Link.js
CHANGED
|
@@ -32,22 +32,24 @@ function Link({
|
|
|
32
32
|
const relativeRef = yield* _(_Placeholder.Placeholder.asRef(relative ?? true));
|
|
33
33
|
const replaceRef = yield* _(_Placeholder.Placeholder.asRef(replace ?? false));
|
|
34
34
|
const stateRef = yield* _(_Placeholder.Placeholder.asRef(state));
|
|
35
|
+
const infoRef = yield* _(_Placeholder.Placeholder.asRef(props.info));
|
|
35
36
|
const reloadDocument = yield* _(_Placeholder.Placeholder.asRef(props.reloadDocument ?? false));
|
|
36
37
|
const href = RefSubject.mapEffect(RefSubject.tuple([relativeRef, toRef]), ([rel, to]) => rel ? (0, _router.makeHref)(to) : Effect.succeed(to));
|
|
37
38
|
const navigate = Effect.gen(function* (_) {
|
|
38
|
-
const
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
reloadDocument
|
|
42
|
-
}));
|
|
39
|
+
const replace = yield* _(replaceRef);
|
|
40
|
+
const state = yield* _(stateRef);
|
|
41
|
+
const reload = yield* _(reloadDocument);
|
|
43
42
|
const url = yield* _(href);
|
|
43
|
+
const info = yield* _(infoRef);
|
|
44
44
|
yield* _(Navigation.navigate(url, {
|
|
45
|
-
|
|
46
|
-
|
|
45
|
+
info,
|
|
46
|
+
history: replace ? "replace" : "auto",
|
|
47
|
+
state
|
|
47
48
|
}));
|
|
48
|
-
if (
|
|
49
|
+
if (reload) {
|
|
49
50
|
yield* _(Navigation.reload({
|
|
50
|
-
|
|
51
|
+
info,
|
|
52
|
+
state
|
|
51
53
|
}));
|
|
52
54
|
}
|
|
53
55
|
});
|
package/dist/cjs/Link.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Link.js","names":["Fx","_interopRequireWildcard","require","RefSubject","Navigation","_router","EventHandler","_Placeholder","Effect","_hyperscript","_Props","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","Link","onClick","relative","replace","state","to","props","children","gen","_","onClickHandler","getEventHandler","toRef","Placeholder","asRef","relativeRef","replaceRef","stateRef","reloadDocument","href","mapEffect","tuple","rel","makeHref","succeed","navigate","
|
|
1
|
+
{"version":3,"file":"Link.js","names":["Fx","_interopRequireWildcard","require","RefSubject","Navigation","_router","EventHandler","_Placeholder","Effect","_hyperscript","_Props","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","Link","onClick","relative","replace","state","to","props","children","gen","_","onClickHandler","getEventHandler","toRef","Placeholder","asRef","relativeRef","replaceRef","stateRef","infoRef","info","reloadDocument","href","mapEffect","tuple","rel","makeHref","succeed","navigate","reload","url","history","onClickEventHandler","preventDefault","ev","handler","options","allProps"],"sources":["../../src/Link.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/dist/dts/Link.d.ts
CHANGED
|
@@ -15,6 +15,7 @@ export type LinkProps = Omit<TypedPropertiesMap["a"], keyof URL> & {
|
|
|
15
15
|
readonly relative?: boolean | Placeholder.Any<boolean>;
|
|
16
16
|
readonly replace?: boolean | Placeholder.Any<boolean>;
|
|
17
17
|
readonly state?: unknown | Placeholder.Any<unknown>;
|
|
18
|
+
readonly info?: unknown | Placeholder.Any<unknown>;
|
|
18
19
|
readonly reloadDocument?: boolean | Placeholder.Any<boolean>;
|
|
19
20
|
};
|
|
20
21
|
/**
|
package/dist/dts/Link.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../src/Link.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,cAAc,CAAA;AAElC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAEpE,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAE1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAGpD;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,GAAG;IACjE,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC7C,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACtD,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACrD,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACnD,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;CAC7D,CAAA;AAED;;GAEG;AACH,wBAAgB,IAAI,CAAC,KAAK,SAAS,SAAS,EAAE,QAAQ,SAAS,aAAa,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,SAAS,EAAE,EAC9G,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,KAAK,EAC1D,GAAG,QAAQ,EAAE,QAAQ,GACpB,EAAE,CAAC,EAAE,CACJ,UAAU,CAAC,UAAU,GACrB,YAAY,GACZ,cAAc,GACd,KAAK,CAAC,KAAK,GACX,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,EAC5D,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,EACxD,WAAW,CACZ,
|
|
1
|
+
{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../src/Link.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,cAAc,CAAA;AAElC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAEpE,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAE1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAGpD;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,GAAG;IACjE,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC7C,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACtD,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACrD,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACnD,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAClD,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;CAC7D,CAAA;AAED;;GAEG;AACH,wBAAgB,IAAI,CAAC,KAAK,SAAS,SAAS,EAAE,QAAQ,SAAS,aAAa,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,SAAS,EAAE,EAC9G,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,KAAK,EAC1D,GAAG,QAAQ,EAAE,QAAQ,GACpB,EAAE,CAAC,EAAE,CACJ,UAAU,CAAC,UAAU,GACrB,YAAY,GACZ,cAAc,GACd,KAAK,CAAC,KAAK,GACX,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,EAC5D,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,EACxD,WAAW,CACZ,CA8CA"}
|
package/dist/esm/Link.js
CHANGED
|
@@ -17,17 +17,22 @@ export function Link({ onClick, relative, replace, state, to, ...props }, ...chi
|
|
|
17
17
|
const relativeRef = yield* _(Placeholder.asRef(relative ?? true));
|
|
18
18
|
const replaceRef = yield* _(Placeholder.asRef(replace ?? false));
|
|
19
19
|
const stateRef = yield* _(Placeholder.asRef(state));
|
|
20
|
+
const infoRef = yield* _(Placeholder.asRef(props.info));
|
|
20
21
|
const reloadDocument = yield* _(Placeholder.asRef(props.reloadDocument ?? false));
|
|
21
22
|
const href = RefSubject.mapEffect(RefSubject.tuple([relativeRef, toRef]), ([rel, to]) => rel ? makeHref(to) : Effect.succeed(to));
|
|
22
23
|
const navigate = Effect.gen(function* (_) {
|
|
23
|
-
const
|
|
24
|
+
const replace = yield* _(replaceRef);
|
|
25
|
+
const state = yield* _(stateRef);
|
|
26
|
+
const reload = yield* _(reloadDocument);
|
|
24
27
|
const url = yield* _(href);
|
|
28
|
+
const info = yield* _(infoRef);
|
|
25
29
|
yield* _(Navigation.navigate(url, {
|
|
26
|
-
|
|
27
|
-
|
|
30
|
+
info,
|
|
31
|
+
history: replace ? "replace" : "auto",
|
|
32
|
+
state
|
|
28
33
|
}));
|
|
29
|
-
if (
|
|
30
|
-
yield* _(Navigation.reload({
|
|
34
|
+
if (reload) {
|
|
35
|
+
yield* _(Navigation.reload({ info, state }));
|
|
31
36
|
}
|
|
32
37
|
});
|
|
33
38
|
const onClickEventHandler = EventHandler.preventDefault((ev) => Effect.gen(function* (_) {
|
package/dist/esm/Link.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Link.js","sourceRoot":"","sources":["../../src/Link.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,cAAc,CAAA;AAClC,OAAO,KAAK,UAAU,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,KAAK,YAAY,MAAM,8BAA8B,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAIzD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,EAAE,CAAC,EAAE,MAAM,kBAAkB,CAAA;AAEpC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"Link.js","sourceRoot":"","sources":["../../src/Link.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typed/ui",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -14,14 +14,14 @@
|
|
|
14
14
|
"@effect/schema": "0.60.6",
|
|
15
15
|
"csstype": "^3.1.3",
|
|
16
16
|
"effect": "^2.1.2",
|
|
17
|
-
"@typed/context": "0.
|
|
18
|
-
"@typed/dom": "
|
|
19
|
-
"@typed/environment": "0.
|
|
20
|
-
"@typed/fx": "1.
|
|
21
|
-
"@typed/navigation": "0.
|
|
22
|
-
"@typed/route": "
|
|
23
|
-
"@typed/router": "0.
|
|
24
|
-
"@typed/template": "0.
|
|
17
|
+
"@typed/context": "0.22.0",
|
|
18
|
+
"@typed/dom": "10.0.0",
|
|
19
|
+
"@typed/environment": "0.4.0",
|
|
20
|
+
"@typed/fx": "1.21.0",
|
|
21
|
+
"@typed/navigation": "0.9.0",
|
|
22
|
+
"@typed/route": "3.0.0",
|
|
23
|
+
"@typed/router": "0.22.0",
|
|
24
|
+
"@typed/template": "0.4.0"
|
|
25
25
|
},
|
|
26
26
|
"main": "./dist/cjs/index.js",
|
|
27
27
|
"module": "./dist/esm/index.js",
|
package/src/Link.ts
CHANGED
|
@@ -26,6 +26,7 @@ export type LinkProps = Omit<TypedPropertiesMap["a"], keyof URL> & {
|
|
|
26
26
|
readonly relative?: boolean | Placeholder.Any<boolean>
|
|
27
27
|
readonly replace?: boolean | Placeholder.Any<boolean>
|
|
28
28
|
readonly state?: unknown | Placeholder.Any<unknown>
|
|
29
|
+
readonly info?: unknown | Placeholder.Any<unknown>
|
|
29
30
|
readonly reloadDocument?: boolean | Placeholder.Any<boolean>
|
|
30
31
|
}
|
|
31
32
|
|
|
@@ -49,23 +50,28 @@ export function Link<Props extends LinkProps, Children extends ReadonlyArray<Ren
|
|
|
49
50
|
const toRef = yield* _(Placeholder.asRef(to))
|
|
50
51
|
const relativeRef = yield* _(Placeholder.asRef(relative ?? true))
|
|
51
52
|
const replaceRef = yield* _(Placeholder.asRef(replace ?? false))
|
|
52
|
-
const stateRef = yield* _(Placeholder.asRef(state
|
|
53
|
+
const stateRef = yield* _(Placeholder.asRef(state))
|
|
54
|
+
const infoRef = yield* _(Placeholder.asRef(props.info))
|
|
53
55
|
const reloadDocument = yield* _(Placeholder.asRef(props.reloadDocument ?? false))
|
|
54
56
|
const href = RefSubject.mapEffect(
|
|
55
57
|
RefSubject.tuple([relativeRef, toRef]),
|
|
56
58
|
([rel, to]) => rel ? makeHref(to) : Effect.succeed(to)
|
|
57
59
|
)
|
|
58
60
|
const navigate = Effect.gen(function*(_) {
|
|
59
|
-
const
|
|
61
|
+
const replace = yield* _(replaceRef)
|
|
62
|
+
const state = yield* _(stateRef)
|
|
63
|
+
const reload = yield* _(reloadDocument)
|
|
60
64
|
const url = yield* _(href)
|
|
65
|
+
const info = yield* _(infoRef)
|
|
61
66
|
|
|
62
67
|
yield* _(Navigation.navigate(url, {
|
|
63
|
-
|
|
64
|
-
|
|
68
|
+
info,
|
|
69
|
+
history: replace ? "replace" : "auto",
|
|
70
|
+
state
|
|
65
71
|
}))
|
|
66
72
|
|
|
67
|
-
if (
|
|
68
|
-
yield* _(Navigation.reload({
|
|
73
|
+
if (reload) {
|
|
74
|
+
yield* _(Navigation.reload({ info, state }))
|
|
69
75
|
}
|
|
70
76
|
})
|
|
71
77
|
|