@tuturuuu/ui 0.19.1 → 0.21.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/CHANGELOG.md +113 -0
- package/biome.json +1 -1
- package/package.json +60 -48
- package/src/components/ui/badge.tsx +2 -0
- package/src/components/ui/button.tsx +2 -0
- package/src/components/ui/custom/__tests__/settings-dialog-shell.test.tsx +48 -4
- package/src/components/ui/custom/__tests__/workspace-select-helpers.test.ts +33 -0
- package/src/components/ui/custom/__tests__/workspace-select-reveal.test.tsx +88 -0
- package/src/components/ui/custom/animated-slot-text.tsx +20 -0
- package/src/components/ui/custom/common-footer.tsx +262 -237
- package/src/components/ui/custom/language-dropdown-item.tsx +3 -10
- package/src/components/ui/custom/language-toggle.test.tsx +30 -0
- package/src/components/ui/custom/language-toggle.tsx +11 -10
- package/src/components/ui/custom/locale-preference.ts +32 -0
- package/src/components/ui/custom/settings/appearance-settings.tsx +5 -13
- package/src/components/ui/custom/settings-dialog-shell.tsx +40 -9
- package/src/components/ui/custom/structure.tsx +12 -0
- package/src/components/ui/custom/system-language-dropdown-item.tsx +3 -6
- package/src/components/ui/custom/workspace-access/adapters.test.ts +10 -1
- package/src/components/ui/custom/workspace-access/adapters.ts +36 -4
- package/src/components/ui/custom/workspace-access/member-filter-utils.test.ts +14 -0
- package/src/components/ui/custom/workspace-access/member-filter-utils.ts +8 -0
- package/src/components/ui/custom/workspace-access/types.ts +20 -0
- package/src/components/ui/custom/workspace-access/workspace-access-context.test.tsx +111 -0
- package/src/components/ui/custom/workspace-access/workspace-access-default-role-card.tsx +15 -5
- package/src/components/ui/custom/workspace-access/workspace-access-invite-dialog.tsx +155 -48
- package/src/components/ui/custom/workspace-access/workspace-access-member-profile-dialog.tsx +92 -0
- package/src/components/ui/custom/workspace-access/workspace-access-member-row.tsx +171 -76
- package/src/components/ui/custom/workspace-access/workspace-access-members.tsx +11 -2
- package/src/components/ui/custom/workspace-access/workspace-access-page-header.tsx +11 -11
- package/src/components/ui/custom/workspace-access/workspace-access-page.tsx +180 -22
- package/src/components/ui/custom/workspace-access/workspace-access-people-filters.tsx +29 -15
- package/src/components/ui/custom/workspace-access/workspace-access-permission-checklist.tsx +56 -10
- package/src/components/ui/custom/workspace-access/workspace-access-permission-preview.test.ts +33 -0
- package/src/components/ui/custom/workspace-access/workspace-access-permission-preview.tsx +24 -1
- package/src/components/ui/custom/workspace-access/workspace-access-responsive.test.ts +64 -0
- package/src/components/ui/custom/workspace-access/workspace-access-role-editor-dialog.tsx +28 -16
- package/src/components/ui/custom/workspace-access/workspace-access-roles.tsx +35 -11
- package/src/components/ui/custom/workspace-access/workspace-access-tabs-toolbar.tsx +23 -11
- package/src/components/ui/custom/workspace-select-helpers.ts +5 -3
- package/src/components/ui/custom/workspace-select-reveal.tsx +46 -0
- package/src/components/ui/custom/workspace-select.tsx +13 -5
- package/src/components/ui/finance/shared/charts/monthly-total-chart-client.tsx +1 -1
- package/src/components/ui/finance/shared/charts/monthly-total-chart.tsx +1 -1
- package/src/components/ui/storefront/cart-summary.tsx +12 -2
- package/src/components/ui/storefront/storefront-surface.test.tsx +21 -0
- package/src/components/ui/storefront/storefront-surface.tsx +6 -0
- package/src/components/ui/text-editor/__tests__/collaboration-binding.test.tsx +161 -0
- package/src/components/ui/text-editor/editor.tsx +267 -235
- package/src/globals.css +166 -0
- package/src/hooks/__tests__/use-workspace-identity-mutation.test.tsx +181 -0
- package/src/hooks/use-workspace-identity-mutation.ts +136 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,118 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [0.21.0](https://github.com/tutur3u/platform/compare/ui-v0.20.1...ui-v0.21.0) (2026-07-27)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Features
|
|
7
|
+
|
|
8
|
+
* **calendar:** redesign workspace sidebar ([194e126](https://github.com/tutur3u/platform/commit/194e1267e573e50416f3866826e2a182b3ff8729))
|
|
9
|
+
* **contacts:** migrate reports + groups and complete the users cutover ([2ee89cd](https://github.com/tutur3u/platform/commit/2ee89cd2257c2a9824df53d4be99436416d85c13))
|
|
10
|
+
* **inventory:** complete Square commerce integration ([fe63eca](https://github.com/tutur3u/platform/commit/fe63eca7d02d94795f93fbbb471069b80c492020))
|
|
11
|
+
* **inventory:** secure Square POS event checkout ([532b463](https://github.com/tutur3u/platform/commit/532b46372116ee0bebfd83ba2af762cc9f668c3c))
|
|
12
|
+
* **landing:** retile the app bento and rebuild the problem section ([c56f42a](https://github.com/tutur3u/platform/commit/c56f42adf754362a269ff08b380db1ee0cf8c6ca))
|
|
13
|
+
* **navigation:** open workspace selector on reveal ([c760d42](https://github.com/tutur3u/platform/commit/c760d42b5e0b8f7bd141e26e2ace956b7f39912e))
|
|
14
|
+
* **offline:** own service worker runtime and refresh dependencies ([ae44477](https://github.com/tutur3u/platform/commit/ae44477603c39f0513244514771653287338a89f))
|
|
15
|
+
* **reports:** add periodic reporting automation ([ec7bd5e](https://github.com/tutur3u/platform/commit/ec7bd5e10abb137e217d1dcf143624530276392f))
|
|
16
|
+
* **satellite:** unify app switcher headers ([411a00c](https://github.com/tutur3u/platform/commit/411a00c9cbb584579e0d8f8e7fa4c2721c414ba3))
|
|
17
|
+
* **storefront:** refine the buyer experience ([45d0e76](https://github.com/tutur3u/platform/commit/45d0e763ff2adc858aa7c76024eb4554879b3977))
|
|
18
|
+
* **tasks:** add autonomous progress intelligence ([ba35df5](https://github.com/tutur3u/platform/commit/ba35df5485fb01e709bf651cc2083b5fa877560f))
|
|
19
|
+
* **tasks:** add leaderboard leave button and per-member sparklines ([5b65238](https://github.com/tutur3u/platform/commit/5b65238c5388345acebacc6cbc612c738cdc3079))
|
|
20
|
+
* **tasks:** make task management autonomous ([431212d](https://github.com/tutur3u/platform/commit/431212d471425aba7fcffdd37d77039d64bec643))
|
|
21
|
+
* **tasks:** promote progress tracking workspace ([058503a](https://github.com/tutur3u/platform/commit/058503a96c8df10725ecd3f88738d574760fc944))
|
|
22
|
+
* **tasks:** revamp progress, goals, analytics & leaderboards with TrackBear parity ([d1bda0e](https://github.com/tutur3u/platform/commit/d1bda0e37a6ed45eb22aaa3bb20c4d62dc41a19f))
|
|
23
|
+
* **tasks:** streamline bulk selection and progress ([3bd2934](https://github.com/tutur3u/platform/commit/3bd2934b3d2dce31b0be8a55ee553069df1f5b5d))
|
|
24
|
+
* **ui:** align landing and locale experience ([aa6e47f](https://github.com/tutur3u/platform/commit/aa6e47f17356ce74111ccf130e8b17071cc7aadf))
|
|
25
|
+
* **web:** improve workspace navigation context ([73959e3](https://github.com/tutur3u/platform/commit/73959e3c6745f60513d23740f30024c5d24e7ee4))
|
|
26
|
+
* **web:** redesign marketing landing page ([13ede78](https://github.com/tutur3u/platform/commit/13ede784ac03af9f25bbb7df61095826c335e002))
|
|
27
|
+
* **web:** refine marketing experience ([c7f1cec](https://github.com/tutur3u/platform/commit/c7f1cec0dd667e6d5f59aaf0bab82069b79c7376))
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
### Bug Fixes
|
|
31
|
+
|
|
32
|
+
* **auth:** resume a pending sign-in after switching accounts ([5403718](https://github.com/tutur3u/platform/commit/54037189ee895863eac621239eb54b8ea94c6ed0))
|
|
33
|
+
* **calendar:** restore provider calendar management ([68753a8](https://github.com/tutur3u/platform/commit/68753a865dcc25a35cd53e5fc7ced1913b9a10bb))
|
|
34
|
+
* **chat:** stop Zalo phone sync spam ([b45e778](https://github.com/tutur3u/platform/commit/b45e778693f175b7bafcd00d6b3ec46f079a946c))
|
|
35
|
+
* **ci:** keep task helper collection source-only ([7355a05](https://github.com/tutur3u/platform/commit/7355a05385ccd8d1e2d1bcf6ac15ae5297e057ad))
|
|
36
|
+
* **ci:** resolve shared task helper during e2e collection ([0319a3b](https://github.com/tutur3u/platform/commit/0319a3bd0df12592b823b7cebdff38cea3e50836))
|
|
37
|
+
* **inventory:** correct storefront bundle checkout ([cb9c247](https://github.com/tutur3u/platform/commit/cb9c24740ceb77f9426ba640383a68bd9ed95d2c))
|
|
38
|
+
* **inventory:** polish mobile sales and settings ([59ef49c](https://github.com/tutur3u/platform/commit/59ef49cde2095361e2b13ce36848e1e39f772c18))
|
|
39
|
+
* **mail:** stabilize layout and managed sender identity ([a22205e](https://github.com/tutur3u/platform/commit/a22205e98a8671ffb628586107de09a7ba8dd1c4))
|
|
40
|
+
* **platform:** address attendance and invoice feedback ([8d2a537](https://github.com/tutur3u/platform/commit/8d2a53782d01427839607c7b0d90eaa3ecc5a1d8))
|
|
41
|
+
* **platform:** improve satellite workspace routing ([0c49c48](https://github.com/tutur3u/platform/commit/0c49c4882d26704fb16ba94ee289ab0af7deb4de))
|
|
42
|
+
* **platform:** persist settings dialog state ([04d2128](https://github.com/tutur3u/platform/commit/04d212807b6fabf33f43743c0b779ba9499334ba))
|
|
43
|
+
* resolve code quality findings ([63f10b5](https://github.com/tutur3u/platform/commit/63f10b5ec22a4194f48f448ee2b1b088b5da8f08))
|
|
44
|
+
* **satellite:** harden workspace settings translations ([7315a2d](https://github.com/tutur3u/platform/commit/7315a2da7b75fd1d66c1c89885aaebc857a44a19))
|
|
45
|
+
* **satellite:** restore mobile workspace settings ([e276f40](https://github.com/tutur3u/platform/commit/e276f4006175cfb501410b3875e661d3975c27f2))
|
|
46
|
+
* **satellite:** restore workspace settings access ([6b4c4f9](https://github.com/tutur3u/platform/commit/6b4c4f92b06b5a68d3116b744a1b8fa6dd9668d2))
|
|
47
|
+
* **security:** remediate code scanning findings ([023db2e](https://github.com/tutur3u/platform/commit/023db2edf4b0557be108a9d772cbc7e2223af947))
|
|
48
|
+
* **settings:** harden workspace role management ([0570687](https://github.com/tutur3u/platform/commit/0570687d255698e438d1eb02262ec0fa7c56240f))
|
|
49
|
+
* **settings:** repair satellite workspace management ([63614cd](https://github.com/tutur3u/platform/commit/63614cdd1550cbf7084724dbed728e798b6f979c))
|
|
50
|
+
* **tasks:** polish task card indicators ([d34966f](https://github.com/tutur3u/platform/commit/d34966fe8939dde56990718acada5a7899a990ed))
|
|
51
|
+
* **tasks:** preserve bulk task list rows ([5aac158](https://github.com/tutur3u/platform/commit/5aac158d38969be83499a5fec114197d0378bac7))
|
|
52
|
+
* **tasks:** quiet the description toolbar and name the compact action honestly ([51838a0](https://github.com/tutur3u/platform/commit/51838a08a1875a44cd4c7f539b35203f890e1a39))
|
|
53
|
+
* **tasks:** repair onboarding and external metadata ([e0b62eb](https://github.com/tutur3u/platform/commit/e0b62eb7119155f6e4cad3dc4fb4d0f9820c98e8))
|
|
54
|
+
* **tasks:** repair task media permissions ([28a0bf1](https://github.com/tutur3u/platform/commit/28a0bf1f1ff11359828a335ac81bb20860062942))
|
|
55
|
+
* **tasks:** restore task description on deep-link opens ([56d4efa](https://github.com/tutur3u/platform/commit/56d4efabd2f036e7dae39588d8aed7b129fa9a11))
|
|
56
|
+
* **tasks:** show one skeleton per task dialog open ([944288b](https://github.com/tutur3u/platform/commit/944288bdc869ee80b3cdf537ee10feb17fdada22))
|
|
57
|
+
* **tasks:** show select all for empty lists ([485ccd7](https://github.com/tutur3u/platform/commit/485ccd737d93d63d00cf582871a9055d819ba694))
|
|
58
|
+
* **tasks:** stabilize task card selection layout ([5754a9c](https://github.com/tutur3u/platform/commit/5754a9c9edcc1fdee5fff116cb809d3d2dc2bf8c))
|
|
59
|
+
* **tasks:** stop the task dialog remounting after it opens ([9a423da](https://github.com/tutur3u/platform/commit/9a423daf7e7c1e901a63ddcc1a8a94ddff9192c9))
|
|
60
|
+
* **ui:** make member management mobile responsive ([104c812](https://github.com/tutur3u/platform/commit/104c8120949ef34bfdc48da74fdc0e2d35eb4ce7))
|
|
61
|
+
* **ui:** prevent iOS form focus zoom ([a0e3f3c](https://github.com/tutur3u/platform/commit/a0e3f3cc10e0ef0676714857088ff8d2b826dcd2))
|
|
62
|
+
* **ui:** publish portable vendored dependencies ([99ad359](https://github.com/tutur3u/platform/commit/99ad35903a27b8f9df26f22fc5f1003aed363d6f))
|
|
63
|
+
* **ui:** refine member access settings ([b5b1ebf](https://github.com/tutur3u/platform/commit/b5b1ebf49a4a3b93532da74357899927f6e5d988))
|
|
64
|
+
* **ui:** unify workspace access and sidebar controls ([450183e](https://github.com/tutur3u/platform/commit/450183ef78af8e09a386bebb93be7018379c5152))
|
|
65
|
+
* **web:** harden prerender client boundaries ([ab1596a](https://github.com/tutur3u/platform/commit/ab1596a769e5a6ae43b0247c651ecbecea52d20d))
|
|
66
|
+
* **workspaces:** propagate a workspace rename without a page reload ([cca0b2d](https://github.com/tutur3u/platform/commit/cca0b2d7e14f6d72f1fdda1deaac18aaf07e9eee))
|
|
67
|
+
* **workspaces:** repair shared member administration ([8a1515b](https://github.com/tutur3u/platform/commit/8a1515ba970adbe690b9d92f77a447adb93c339f))
|
|
68
|
+
|
|
69
|
+
|
|
70
|
+
### Performance Improvements
|
|
71
|
+
|
|
72
|
+
* **inventory:** add event-driven storefront caching ([2f571f4](https://github.com/tutur3u/platform/commit/2f571f4fc534bf5dee0ca36c4310d87b44e6e613))
|
|
73
|
+
* **storefront:** share customer navigation shell ([21cb78d](https://github.com/tutur3u/platform/commit/21cb78db484d1e1fdb9f2469fcac4e3a948bd176))
|
|
74
|
+
* **storefront:** stabilize navigation and cart rendering ([471c6b7](https://github.com/tutur3u/platform/commit/471c6b75abc6a4d69692e868cc1b220785e03262))
|
|
75
|
+
* **web:** reduce dashboard request overhead ([93f4b2b](https://github.com/tutur3u/platform/commit/93f4b2b354286b33c5cf8ff9ee0e54a31b18a022))
|
|
76
|
+
|
|
77
|
+
## [0.20.1](https://github.com/tutur3u/platform/compare/ui-v0.20.0...ui-v0.20.1) (2026-07-27)
|
|
78
|
+
|
|
79
|
+
|
|
80
|
+
### Bug Fixes
|
|
81
|
+
|
|
82
|
+
* **auth:** resume a pending sign-in after switching accounts ([5403718](https://github.com/tutur3u/platform/commit/54037189ee895863eac621239eb54b8ea94c6ed0))
|
|
83
|
+
* **tasks:** quiet the description toolbar and name the compact action honestly ([51838a0](https://github.com/tutur3u/platform/commit/51838a08a1875a44cd4c7f539b35203f890e1a39))
|
|
84
|
+
* **tasks:** show one skeleton per task dialog open ([944288b](https://github.com/tutur3u/platform/commit/944288bdc869ee80b3cdf537ee10feb17fdada22))
|
|
85
|
+
* **tasks:** stop the task dialog remounting after it opens ([9a423da](https://github.com/tutur3u/platform/commit/9a423daf7e7c1e901a63ddcc1a8a94ddff9192c9))
|
|
86
|
+
* **workspaces:** propagate a workspace rename without a page reload ([cca0b2d](https://github.com/tutur3u/platform/commit/cca0b2d7e14f6d72f1fdda1deaac18aaf07e9eee))
|
|
87
|
+
|
|
88
|
+
## [0.20.0](https://github.com/tutur3u/platform/compare/ui-v0.19.1...ui-v0.20.0) (2026-07-25)
|
|
89
|
+
|
|
90
|
+
|
|
91
|
+
### Features
|
|
92
|
+
|
|
93
|
+
* **inventory:** secure Square POS event checkout ([532b463](https://github.com/tutur3u/platform/commit/532b46372116ee0bebfd83ba2af762cc9f668c3c))
|
|
94
|
+
* **landing:** retile the app bento and rebuild the problem section ([c56f42a](https://github.com/tutur3u/platform/commit/c56f42adf754362a269ff08b380db1ee0cf8c6ca))
|
|
95
|
+
* **offline:** own service worker runtime and refresh dependencies ([ae44477](https://github.com/tutur3u/platform/commit/ae44477603c39f0513244514771653287338a89f))
|
|
96
|
+
* **reports:** add periodic reporting automation ([ec7bd5e](https://github.com/tutur3u/platform/commit/ec7bd5e10abb137e217d1dcf143624530276392f))
|
|
97
|
+
* **ui:** align landing and locale experience ([aa6e47f](https://github.com/tutur3u/platform/commit/aa6e47f17356ce74111ccf130e8b17071cc7aadf))
|
|
98
|
+
* **web:** improve workspace navigation context ([73959e3](https://github.com/tutur3u/platform/commit/73959e3c6745f60513d23740f30024c5d24e7ee4))
|
|
99
|
+
* **web:** redesign marketing landing page ([13ede78](https://github.com/tutur3u/platform/commit/13ede784ac03af9f25bbb7df61095826c335e002))
|
|
100
|
+
* **web:** refine marketing experience ([c7f1cec](https://github.com/tutur3u/platform/commit/c7f1cec0dd667e6d5f59aaf0bab82069b79c7376))
|
|
101
|
+
|
|
102
|
+
|
|
103
|
+
### Bug Fixes
|
|
104
|
+
|
|
105
|
+
* **platform:** improve satellite workspace routing ([0c49c48](https://github.com/tutur3u/platform/commit/0c49c4882d26704fb16ba94ee289ab0af7deb4de))
|
|
106
|
+
* **platform:** persist settings dialog state ([04d2128](https://github.com/tutur3u/platform/commit/04d212807b6fabf33f43743c0b779ba9499334ba))
|
|
107
|
+
* **settings:** harden workspace role management ([0570687](https://github.com/tutur3u/platform/commit/0570687d255698e438d1eb02262ec0fa7c56240f))
|
|
108
|
+
* **settings:** repair satellite workspace management ([63614cd](https://github.com/tutur3u/platform/commit/63614cdd1550cbf7084724dbed728e798b6f979c))
|
|
109
|
+
* **tasks:** restore task description on deep-link opens ([56d4efa](https://github.com/tutur3u/platform/commit/56d4efabd2f036e7dae39588d8aed7b129fa9a11))
|
|
110
|
+
* **ui:** make member management mobile responsive ([104c812](https://github.com/tutur3u/platform/commit/104c8120949ef34bfdc48da74fdc0e2d35eb4ce7))
|
|
111
|
+
* **ui:** refine member access settings ([b5b1ebf](https://github.com/tutur3u/platform/commit/b5b1ebf49a4a3b93532da74357899927f6e5d988))
|
|
112
|
+
* **ui:** unify workspace access and sidebar controls ([450183e](https://github.com/tutur3u/platform/commit/450183ef78af8e09a386bebb93be7018379c5152))
|
|
113
|
+
* **web:** harden prerender client boundaries ([ab1596a](https://github.com/tutur3u/platform/commit/ab1596a769e5a6ae43b0247c651ecbecea52d20d))
|
|
114
|
+
* **workspaces:** repair shared member administration ([8a1515b](https://github.com/tutur3u/platform/commit/8a1515ba970adbe690b9d92f77a447adb93c339f))
|
|
115
|
+
|
|
3
116
|
## [0.19.1](https://github.com/tutur3u/platform/compare/ui-v0.19.0...ui-v0.19.1) (2026-07-21)
|
|
4
117
|
|
|
5
118
|
|
package/biome.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tuturuuu/ui",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.21.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -24,33 +24,33 @@
|
|
|
24
24
|
"@hookform/resolvers": "^5.4.0",
|
|
25
25
|
"@json-render/core": "^0.19.0",
|
|
26
26
|
"@json-render/react": "^0.19.0",
|
|
27
|
-
"@radix-ui/react-accordion": "^1.2.
|
|
28
|
-
"@radix-ui/react-alert-dialog": "^1.1.
|
|
29
|
-
"@radix-ui/react-aspect-ratio": "^1.1.
|
|
30
|
-
"@radix-ui/react-avatar": "^1.2.
|
|
31
|
-
"@radix-ui/react-checkbox": "^1.3.
|
|
32
|
-
"@radix-ui/react-collapsible": "^1.1.
|
|
33
|
-
"@radix-ui/react-context-menu": "^2.3.
|
|
34
|
-
"@radix-ui/react-dialog": "^1.1.
|
|
35
|
-
"@radix-ui/react-dropdown-menu": "^2.1.
|
|
36
|
-
"@radix-ui/react-hover-card": "^1.1.
|
|
37
|
-
"@radix-ui/react-label": "^2.1.
|
|
38
|
-
"@radix-ui/react-menubar": "^1.1.
|
|
39
|
-
"@radix-ui/react-navigation-menu": "^1.2.
|
|
40
|
-
"@radix-ui/react-popover": "^1.1.
|
|
41
|
-
"@radix-ui/react-progress": "^1.1.
|
|
42
|
-
"@radix-ui/react-radio-group": "^1.4.
|
|
43
|
-
"@radix-ui/react-scroll-area": "^1.2.
|
|
44
|
-
"@radix-ui/react-select": "^2.3.
|
|
45
|
-
"@radix-ui/react-separator": "^1.1.
|
|
46
|
-
"@radix-ui/react-slider": "^1.4.
|
|
47
|
-
"@radix-ui/react-slot": "^1.3.
|
|
48
|
-
"@radix-ui/react-switch": "^1.3.
|
|
49
|
-
"@radix-ui/react-tabs": "^1.1.
|
|
50
|
-
"@radix-ui/react-toast": "^1.2.
|
|
51
|
-
"@radix-ui/react-toggle": "^1.1.
|
|
52
|
-
"@radix-ui/react-toggle-group": "^1.1.
|
|
53
|
-
"@radix-ui/react-tooltip": "^1.2.
|
|
27
|
+
"@radix-ui/react-accordion": "^1.2.18",
|
|
28
|
+
"@radix-ui/react-alert-dialog": "^1.1.21",
|
|
29
|
+
"@radix-ui/react-aspect-ratio": "^1.1.13",
|
|
30
|
+
"@radix-ui/react-avatar": "^1.2.4",
|
|
31
|
+
"@radix-ui/react-checkbox": "^1.3.9",
|
|
32
|
+
"@radix-ui/react-collapsible": "^1.1.18",
|
|
33
|
+
"@radix-ui/react-context-menu": "^2.3.5",
|
|
34
|
+
"@radix-ui/react-dialog": "^1.1.21",
|
|
35
|
+
"@radix-ui/react-dropdown-menu": "^2.1.22",
|
|
36
|
+
"@radix-ui/react-hover-card": "^1.1.21",
|
|
37
|
+
"@radix-ui/react-label": "^2.1.13",
|
|
38
|
+
"@radix-ui/react-menubar": "^1.1.22",
|
|
39
|
+
"@radix-ui/react-navigation-menu": "^1.2.20",
|
|
40
|
+
"@radix-ui/react-popover": "^1.1.21",
|
|
41
|
+
"@radix-ui/react-progress": "^1.1.14",
|
|
42
|
+
"@radix-ui/react-radio-group": "^1.4.5",
|
|
43
|
+
"@radix-ui/react-scroll-area": "^1.2.16",
|
|
44
|
+
"@radix-ui/react-select": "^2.3.5",
|
|
45
|
+
"@radix-ui/react-separator": "^1.1.13",
|
|
46
|
+
"@radix-ui/react-slider": "^1.4.5",
|
|
47
|
+
"@radix-ui/react-slot": "^1.3.1",
|
|
48
|
+
"@radix-ui/react-switch": "^1.3.5",
|
|
49
|
+
"@radix-ui/react-tabs": "^1.1.19",
|
|
50
|
+
"@radix-ui/react-toast": "^1.2.21",
|
|
51
|
+
"@radix-ui/react-toggle": "^1.1.16",
|
|
52
|
+
"@radix-ui/react-toggle-group": "^1.1.17",
|
|
53
|
+
"@radix-ui/react-tooltip": "^1.2.14",
|
|
54
54
|
"@streamdown/cjk": "^1.0.3",
|
|
55
55
|
"@streamdown/code": "^1.1.1",
|
|
56
56
|
"@streamdown/math": "^1.0.2",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"@tanstack/react-pacer": "^0.22.1",
|
|
60
60
|
"@tanstack/react-query": "^5.101.2",
|
|
61
61
|
"@tanstack/react-table": "^8.21.3",
|
|
62
|
-
"@tanstack/react-virtual": "^3.14.
|
|
62
|
+
"@tanstack/react-virtual": "^3.14.8",
|
|
63
63
|
"@tiptap/core": "3.28.0",
|
|
64
64
|
"@tiptap/extension-collaboration": "3.28.0",
|
|
65
65
|
"@tiptap/extension-collaboration-caret": "3.28.0",
|
|
@@ -86,13 +86,13 @@
|
|
|
86
86
|
"@tiptap/pm": "3.28.0",
|
|
87
87
|
"@tiptap/react": "3.28.0",
|
|
88
88
|
"@tiptap/starter-kit": "3.28.0",
|
|
89
|
-
"@tuturuuu/ai": "0.
|
|
90
|
-
"@tuturuuu/apis": "0.
|
|
91
|
-
"@tuturuuu/hooks": "0.0
|
|
92
|
-
"@tuturuuu/icons": "0.0
|
|
93
|
-
"@tuturuuu/internal-api": "0.
|
|
94
|
-
"@tuturuuu/supabase": "0.
|
|
95
|
-
"@tuturuuu/utils": "0.
|
|
89
|
+
"@tuturuuu/ai": "0.5.0",
|
|
90
|
+
"@tuturuuu/apis": "0.10.0",
|
|
91
|
+
"@tuturuuu/hooks": "0.1.0",
|
|
92
|
+
"@tuturuuu/icons": "0.1.0",
|
|
93
|
+
"@tuturuuu/internal-api": "0.23.0",
|
|
94
|
+
"@tuturuuu/supabase": "0.5.0",
|
|
95
|
+
"@tuturuuu/utils": "0.19.0",
|
|
96
96
|
"@types/debug": "^4.1.13",
|
|
97
97
|
"browser-image-compression": "^2.0.2",
|
|
98
98
|
"class-variance-authority": "^0.7.1",
|
|
@@ -100,29 +100,29 @@
|
|
|
100
100
|
"cookies-next": "^6.1.1",
|
|
101
101
|
"date-fns": "^4.4.0",
|
|
102
102
|
"date-fns-tz": "^3.2.0",
|
|
103
|
-
"dayjs": "^1.11.
|
|
103
|
+
"dayjs": "^1.11.21",
|
|
104
104
|
"debug": "^4.4.3",
|
|
105
105
|
"embla-carousel-react": "^8.6.0",
|
|
106
106
|
"eventemitter3": "^5.0.4",
|
|
107
107
|
"framer-motion": "^12.42.2",
|
|
108
108
|
"gsap": "^3.15.0",
|
|
109
|
-
"html2canvas-pro": "^2.
|
|
109
|
+
"html2canvas-pro": "^2.3.1",
|
|
110
110
|
"input-otp": "^1.4.2",
|
|
111
111
|
"katex": "^0.18.1",
|
|
112
112
|
"lodash": "4.18.1",
|
|
113
113
|
"moment": "^2.30.1",
|
|
114
114
|
"motion": "^12.42.2",
|
|
115
|
-
"next": "^16.3.0-preview.
|
|
116
|
-
"next-intl": "^4.13.
|
|
115
|
+
"next": "^16.3.0-preview.9",
|
|
116
|
+
"next-intl": "^4.13.4",
|
|
117
117
|
"next-themes": "^0.4.6",
|
|
118
118
|
"nuqs": "^2.9.1",
|
|
119
119
|
"prosemirror-state": "^1.4.4",
|
|
120
120
|
"prosemirror-view": "1.42.1",
|
|
121
121
|
"qrcode.react": "^4.2.0",
|
|
122
|
-
"react": "^19.2.
|
|
122
|
+
"react": "^19.2.8",
|
|
123
123
|
"react-colorful": "^5.8.0",
|
|
124
124
|
"react-day-picker": "^10.0.1",
|
|
125
|
-
"react-dom": "^19.2.
|
|
125
|
+
"react-dom": "^19.2.8",
|
|
126
126
|
"react-dropzone": "^19.1.1",
|
|
127
127
|
"react-hook-form": "^7.82.0",
|
|
128
128
|
"react-markdown": "^10.1.0",
|
|
@@ -131,7 +131,7 @@
|
|
|
131
131
|
"react-resizable": "^4.0.2",
|
|
132
132
|
"react-resizable-panels": "^4.12.2",
|
|
133
133
|
"react-syntax-highlighter": "^16.1.1",
|
|
134
|
-
"recharts": "3.
|
|
134
|
+
"recharts": "3.10.0",
|
|
135
135
|
"slot-text": "^0.3.3",
|
|
136
136
|
"sonner": "^2.0.7",
|
|
137
137
|
"streamdown": "^2.5.0",
|
|
@@ -148,11 +148,11 @@
|
|
|
148
148
|
"devDependencies": {
|
|
149
149
|
"@tailwindcss/postcss": "^4.3.3",
|
|
150
150
|
"@tailwindcss/typography": "^0.5.20",
|
|
151
|
-
"@tanstack/react-query": "^5.101.
|
|
151
|
+
"@tanstack/react-query": "^5.101.4",
|
|
152
152
|
"@tanstack/react-table": "^8.21.3",
|
|
153
|
-
"@testing-library/jest-dom": "^
|
|
153
|
+
"@testing-library/jest-dom": "^7.0.0",
|
|
154
154
|
"@testing-library/react": "^16.3.2",
|
|
155
|
-
"@tuturuuu/types": "0.
|
|
155
|
+
"@tuturuuu/types": "0.22.0",
|
|
156
156
|
"@tuturuuu/typescript-config": "0.1.1",
|
|
157
157
|
"@types/html2canvas": "^1.0.0",
|
|
158
158
|
"@types/lodash": "^4.17.24",
|
|
@@ -162,10 +162,10 @@
|
|
|
162
162
|
"@types/react-resizable": "^4.0.0",
|
|
163
163
|
"@types/react-syntax-highlighter": "^15.5.13",
|
|
164
164
|
"@types/uuid": "^11.0.0",
|
|
165
|
-
"@vitejs/plugin-react": "^6.0.
|
|
165
|
+
"@vitejs/plugin-react": "^6.0.4",
|
|
166
166
|
"autoprefixer": "^10.5.4",
|
|
167
167
|
"jsdom": "^29.1.1",
|
|
168
|
-
"postcss": "^8.5.
|
|
168
|
+
"postcss": "^8.5.22",
|
|
169
169
|
"postcss-load-config": "^6.0.1",
|
|
170
170
|
"tailwindcss": "^4.3.3",
|
|
171
171
|
"typescript": "7.0.2",
|
|
@@ -274,6 +274,10 @@
|
|
|
274
274
|
"types": "./src/components/ui/custom/sidebar-context.tsx",
|
|
275
275
|
"import": "./src/components/ui/custom/sidebar-context.tsx"
|
|
276
276
|
},
|
|
277
|
+
"./custom/animated-slot-text": {
|
|
278
|
+
"types": "./src/components/ui/custom/animated-slot-text.tsx",
|
|
279
|
+
"import": "./src/components/ui/custom/animated-slot-text.tsx"
|
|
280
|
+
},
|
|
277
281
|
"./custom/nav": {
|
|
278
282
|
"types": "./src/components/ui/custom/nav.tsx",
|
|
279
283
|
"import": "./src/components/ui/custom/nav.tsx"
|
|
@@ -294,6 +298,10 @@
|
|
|
294
298
|
"types": "./src/components/ui/custom/language-dropdown-wrapper.tsx",
|
|
295
299
|
"import": "./src/components/ui/custom/language-dropdown-wrapper.tsx"
|
|
296
300
|
},
|
|
301
|
+
"./custom/locale-preference": {
|
|
302
|
+
"types": "./src/components/ui/custom/locale-preference.ts",
|
|
303
|
+
"import": "./src/components/ui/custom/locale-preference.ts"
|
|
304
|
+
},
|
|
297
305
|
"./custom/system-language-dropdown-item": {
|
|
298
306
|
"types": "./src/components/ui/custom/system-language-dropdown-item.tsx",
|
|
299
307
|
"import": "./src/components/ui/custom/system-language-dropdown-item.tsx"
|
|
@@ -314,6 +322,10 @@
|
|
|
314
322
|
"types": "./src/components/ui/custom/workspace-select.tsx",
|
|
315
323
|
"import": "./src/components/ui/custom/workspace-select.tsx"
|
|
316
324
|
},
|
|
325
|
+
"./custom/workspace-select-reveal": {
|
|
326
|
+
"types": "./src/components/ui/custom/workspace-select-reveal.tsx",
|
|
327
|
+
"import": "./src/components/ui/custom/workspace-select-reveal.tsx"
|
|
328
|
+
},
|
|
317
329
|
"./custom/notification-popover-client": {
|
|
318
330
|
"types": "./src/components/ui/custom/notification-popover-client.tsx",
|
|
319
331
|
"import": "./src/components/ui/custom/notification-popover-client.tsx"
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import '@testing-library/jest-dom';
|
|
2
|
-
import { fireEvent, render, screen } from '@testing-library/react';
|
|
3
|
-
import {
|
|
2
|
+
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
|
|
3
|
+
import {
|
|
4
|
+
type OnUrlUpdateFunction,
|
|
5
|
+
withNuqsTestingAdapter,
|
|
6
|
+
} from 'nuqs/adapters/testing';
|
|
7
|
+
import { type ReactNode, useState } from 'react';
|
|
4
8
|
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
5
9
|
import { Dialog } from '../../dialog';
|
|
6
10
|
import {
|
|
@@ -55,7 +59,13 @@ const navItems: SettingsNavGroup[] = [
|
|
|
55
59
|
},
|
|
56
60
|
];
|
|
57
61
|
|
|
58
|
-
function renderShell(
|
|
62
|
+
function renderShell(
|
|
63
|
+
activeGroupBreadcrumb?: ReactNode,
|
|
64
|
+
options?: {
|
|
65
|
+
onUrlUpdate?: OnUrlUpdateFunction;
|
|
66
|
+
searchParams?: string;
|
|
67
|
+
}
|
|
68
|
+
) {
|
|
59
69
|
function Harness() {
|
|
60
70
|
const [activeTab, setActiveTab] = useState('profile');
|
|
61
71
|
|
|
@@ -63,6 +73,7 @@ function renderShell() {
|
|
|
63
73
|
<Dialog open>
|
|
64
74
|
<SettingsDialogShell
|
|
65
75
|
activeTab={activeTab}
|
|
76
|
+
activeGroupBreadcrumb={activeGroupBreadcrumb}
|
|
66
77
|
keyboardNavigation
|
|
67
78
|
navItems={navItems}
|
|
68
79
|
onActiveTabChange={setActiveTab}
|
|
@@ -74,7 +85,9 @@ function renderShell() {
|
|
|
74
85
|
);
|
|
75
86
|
}
|
|
76
87
|
|
|
77
|
-
return render(<Harness
|
|
88
|
+
return render(<Harness />, {
|
|
89
|
+
wrapper: withNuqsTestingAdapter(options),
|
|
90
|
+
});
|
|
78
91
|
}
|
|
79
92
|
|
|
80
93
|
describe('SettingsDialogShell keyboard navigation', () => {
|
|
@@ -148,6 +161,17 @@ describe('SettingsDialogShell keyboard navigation', () => {
|
|
|
148
161
|
expect(screen.getByText('Forms')).toBeVisible();
|
|
149
162
|
});
|
|
150
163
|
|
|
164
|
+
it('can replace the active group crumb with an interactive context control', () => {
|
|
165
|
+
renderShell(<button type="button">Switch workspace</button>);
|
|
166
|
+
|
|
167
|
+
const breadcrumb = screen.getByTestId('settings-active-group-breadcrumb');
|
|
168
|
+
|
|
169
|
+
expect(breadcrumb).toContainElement(
|
|
170
|
+
screen.getByRole('button', { name: 'Switch workspace' })
|
|
171
|
+
);
|
|
172
|
+
expect(breadcrumb).not.toHaveTextContent('Account');
|
|
173
|
+
});
|
|
174
|
+
|
|
151
175
|
it('focuses settings search with slash and modifier search shortcuts', () => {
|
|
152
176
|
renderShell();
|
|
153
177
|
|
|
@@ -185,6 +209,26 @@ describe('SettingsDialogShell keyboard navigation', () => {
|
|
|
185
209
|
expect(activeTab).toHaveTextContent('profile');
|
|
186
210
|
});
|
|
187
211
|
|
|
212
|
+
it('restores the active section from the URL and persists tab changes', async () => {
|
|
213
|
+
const onUrlUpdate = vi.fn<OnUrlUpdateFunction>();
|
|
214
|
+
|
|
215
|
+
renderShell(undefined, {
|
|
216
|
+
onUrlUpdate,
|
|
217
|
+
searchParams: '?settingsDialog=open&settingsTab=appearance',
|
|
218
|
+
});
|
|
219
|
+
|
|
220
|
+
await waitFor(() =>
|
|
221
|
+
expect(screen.getByTestId('active-tab')).toHaveTextContent('appearance')
|
|
222
|
+
);
|
|
223
|
+
|
|
224
|
+
fireEvent.click(screen.getAllByText('Profile')[0]!);
|
|
225
|
+
|
|
226
|
+
await waitFor(() => {
|
|
227
|
+
const update = onUrlUpdate.mock.calls.at(-1)?.[0];
|
|
228
|
+
expect(update?.searchParams.get('settingsTab')).toBe('profile');
|
|
229
|
+
});
|
|
230
|
+
});
|
|
231
|
+
|
|
188
232
|
it('does not handle navigation shortcuts outside the dialog content', () => {
|
|
189
233
|
renderShell();
|
|
190
234
|
|
|
@@ -75,9 +75,42 @@ describe('mergeWorkspaceSelectWorkspaces', () => {
|
|
|
75
75
|
"t('common.join_workspace_action')"
|
|
76
76
|
);
|
|
77
77
|
});
|
|
78
|
+
|
|
79
|
+
it('supports a modal popover so nested settings pickers remain scrollable', () => {
|
|
80
|
+
const workspaceSelectSource = readFileSync(
|
|
81
|
+
join(process.cwd(), 'src/components/ui/custom/workspace-select.tsx'),
|
|
82
|
+
'utf8'
|
|
83
|
+
);
|
|
84
|
+
|
|
85
|
+
expect(workspaceSelectSource).toContain('popoverModal = false');
|
|
86
|
+
expect(workspaceSelectSource).toContain('<Popover modal={popoverModal}');
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
it('focuses workspace search as soon as the picker opens', () => {
|
|
90
|
+
const workspaceSelectSource = readFileSync(
|
|
91
|
+
join(process.cwd(), 'src/components/ui/custom/workspace-select.tsx'),
|
|
92
|
+
'utf8'
|
|
93
|
+
);
|
|
94
|
+
|
|
95
|
+
expect(workspaceSelectSource).toContain(
|
|
96
|
+
'<CommandInput autoFocus placeholder="Search workspace..." />'
|
|
97
|
+
);
|
|
98
|
+
});
|
|
78
99
|
});
|
|
79
100
|
|
|
80
101
|
describe('normalizeWorkspaceSwitchPath', () => {
|
|
102
|
+
it('lands on tasks when switching workspace from a canonical task board detail route', () => {
|
|
103
|
+
expect(
|
|
104
|
+
normalizeWorkspaceSwitchPath('/personal/boards/board-1', 'personal')
|
|
105
|
+
).toBe('/personal/tasks');
|
|
106
|
+
});
|
|
107
|
+
|
|
108
|
+
it('lands on tasks when switching workspace from the canonical task boards index', () => {
|
|
109
|
+
expect(normalizeWorkspaceSwitchPath('/personal/boards', 'personal')).toBe(
|
|
110
|
+
'/personal/tasks'
|
|
111
|
+
);
|
|
112
|
+
});
|
|
113
|
+
|
|
81
114
|
it('lands on tasks when switching workspace from a task board detail route', () => {
|
|
82
115
|
expect(
|
|
83
116
|
normalizeWorkspaceSwitchPath('/personal/tasks/boards/board-1', 'personal')
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { fireEvent, render, screen } from '@testing-library/react';
|
|
2
|
+
import { useState } from 'react';
|
|
3
|
+
import { describe, expect, it } from 'vitest';
|
|
4
|
+
import {
|
|
5
|
+
useOpenWorkspaceSelectWhenRevealed,
|
|
6
|
+
WorkspaceSelectRevealProvider,
|
|
7
|
+
} from '../workspace-select-reveal';
|
|
8
|
+
|
|
9
|
+
function SelectorHarness({
|
|
10
|
+
hasSelectableWorkspaces,
|
|
11
|
+
}: {
|
|
12
|
+
hasSelectableWorkspaces: boolean;
|
|
13
|
+
}) {
|
|
14
|
+
const [open, setOpen] = useState(false);
|
|
15
|
+
useOpenWorkspaceSelectWhenRevealed(hasSelectableWorkspaces, setOpen);
|
|
16
|
+
|
|
17
|
+
return (
|
|
18
|
+
<>
|
|
19
|
+
<output data-testid="selector-state">{open ? 'open' : 'closed'}</output>
|
|
20
|
+
<button type="button" onClick={() => setOpen(false)}>
|
|
21
|
+
Close selector
|
|
22
|
+
</button>
|
|
23
|
+
<button type="button" onClick={() => setOpen(true)}>
|
|
24
|
+
Open selector
|
|
25
|
+
</button>
|
|
26
|
+
</>
|
|
27
|
+
);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
function TestTree({
|
|
31
|
+
hasSelectableWorkspaces = true,
|
|
32
|
+
revealed,
|
|
33
|
+
}: {
|
|
34
|
+
hasSelectableWorkspaces?: boolean;
|
|
35
|
+
revealed: boolean;
|
|
36
|
+
}) {
|
|
37
|
+
return (
|
|
38
|
+
<WorkspaceSelectRevealProvider revealed={revealed}>
|
|
39
|
+
<SelectorHarness hasSelectableWorkspaces={hasSelectableWorkspaces} />
|
|
40
|
+
</WorkspaceSelectRevealProvider>
|
|
41
|
+
);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
describe('WorkspaceSelectRevealProvider', () => {
|
|
45
|
+
it('opens the selector each time its collapsed sidebar section is revealed', () => {
|
|
46
|
+
const { rerender } = render(<TestTree revealed={false} />);
|
|
47
|
+
|
|
48
|
+
expect(screen.getByTestId('selector-state')).toHaveTextContent('closed');
|
|
49
|
+
|
|
50
|
+
rerender(<TestTree revealed />);
|
|
51
|
+
expect(screen.getByTestId('selector-state')).toHaveTextContent('open');
|
|
52
|
+
|
|
53
|
+
fireEvent.click(screen.getByRole('button', { name: 'Close selector' }));
|
|
54
|
+
expect(screen.getByTestId('selector-state')).toHaveTextContent('closed');
|
|
55
|
+
|
|
56
|
+
rerender(<TestTree revealed />);
|
|
57
|
+
expect(screen.getByTestId('selector-state')).toHaveTextContent('closed');
|
|
58
|
+
|
|
59
|
+
rerender(<TestTree revealed={false} />);
|
|
60
|
+
expect(screen.getByTestId('selector-state')).toHaveTextContent('closed');
|
|
61
|
+
|
|
62
|
+
rerender(<TestTree revealed />);
|
|
63
|
+
expect(screen.getByTestId('selector-state')).toHaveTextContent('open');
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
it('waits for an available workspace before opening', () => {
|
|
67
|
+
const { rerender } = render(
|
|
68
|
+
<TestTree hasSelectableWorkspaces={false} revealed />
|
|
69
|
+
);
|
|
70
|
+
|
|
71
|
+
expect(screen.getByTestId('selector-state')).toHaveTextContent('closed');
|
|
72
|
+
|
|
73
|
+
rerender(<TestTree hasSelectableWorkspaces revealed />);
|
|
74
|
+
expect(screen.getByTestId('selector-state')).toHaveTextContent('open');
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
it('does not control workspace selectors outside a reveal section', () => {
|
|
78
|
+
const { rerender } = render(
|
|
79
|
+
<SelectorHarness hasSelectableWorkspaces={false} />
|
|
80
|
+
);
|
|
81
|
+
|
|
82
|
+
fireEvent.click(screen.getByRole('button', { name: 'Open selector' }));
|
|
83
|
+
expect(screen.getByTestId('selector-state')).toHaveTextContent('open');
|
|
84
|
+
|
|
85
|
+
rerender(<SelectorHarness hasSelectableWorkspaces />);
|
|
86
|
+
expect(screen.getByTestId('selector-state')).toHaveTextContent('open');
|
|
87
|
+
});
|
|
88
|
+
});
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
'use client';
|
|
2
|
+
|
|
3
|
+
import { cn } from '@tuturuuu/utils/format';
|
|
4
|
+
import { SlotText } from 'slot-text/react';
|
|
5
|
+
|
|
6
|
+
export function AnimatedSlotText({
|
|
7
|
+
className,
|
|
8
|
+
text,
|
|
9
|
+
}: {
|
|
10
|
+
className?: string;
|
|
11
|
+
text: string;
|
|
12
|
+
}) {
|
|
13
|
+
return (
|
|
14
|
+
<SlotText
|
|
15
|
+
className={cn('line-clamp-1 break-all', className)}
|
|
16
|
+
options={{ bounce: 0.1, duration: 180, stagger: 12 }}
|
|
17
|
+
text={text}
|
|
18
|
+
/>
|
|
19
|
+
);
|
|
20
|
+
}
|