@hanzo/ui 5.3.33 → 5.3.35

package/dist/util/step-animation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"step-animation.d.ts","sourceRoot":"","sources":["../../util/step-animation.ts"],"names":[],"mappings":"AAGA,UAAU,aAAa;IACrB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;CAC/B;AAsED,QAAA,MAAM,gBAAgB,gBAAiB,MAAM,OAAO,aAAa,MAAM,EAAE,KAAG,aAS3E,CAAA;AAED,OAAO,EACL,KAAK,aAAa,EAClB,gBAAgB,EACjB,CAAA"}

package/dist/util/step-animation.js

@@ -0,0 +1,60 @@
+import { useEffect, useRef } from 'react';
+import { makeObservable, reaction, computed, observable, action } from 'mobx';
+class MyStepAnimation {
+    /**  initialStep: false -> true: step 0
+                      true -> false: step 1
+         after intervals[0] : step 2
+         after intervals[1] : step 3
+
+        initialStep must contain at least one mobx observable and return boolean
+        see: https://mobx.js.org/reactions.html#reaction
+    */
+    constructor(initialStep, intervals) {
+        this._step = -1;
+        this._reactionDisposer = undefined;
+        // This is separated out because reactions have to be created
+        // once we have a valid doc / window etc. (mobx internals)
+        // Can't just do it in constructor and assign to ref
+        this.initialize = () => {
+            const fireNext = () => {
+                this._setStep(this._step + 1);
+                if (this._step <= this._intervals.length) {
+                    // No need to call clearTimeout(): https://stackoverflow.com/a/7391588/11645689
+                    setTimeout(() => { fireNext(); }, this._intervals[this._step - 1]);
+                }
+            };
+            this._reactionDisposer = reaction(this._initialStep, (triggered) => {
+                if (triggered && this._step === -1) {
+                    this._setStep(0);
+                }
+                // extra safe
+                else if (this._step === 0) {
+                    fireNext();
+                }
+            });
+        };
+        this._setStep = (v) => { this._step = v; };
+        this.dispose = () => {
+            if (this._reactionDisposer) {
+                this._reactionDisposer();
+            }
+        };
+        // https://mobx.js.org/computeds-with-args.html#2-close-over-the-arguments
+        this.notPast = (step) => (computed(() => (this._step > -1 && this._step <= step)).get());
+        this._initialStep = initialStep;
+        this._intervals = intervals;
+        makeObservable(this, {
+            _step: observable,
+            _setStep: action
+        });
+    }
+}
+const useStepAnimation = (initialStep, intervals) => {
+    const animRef = useRef(new MyStepAnimation(initialStep, intervals));
+    useEffect(() => {
+        animRef.current.initialize();
+        return animRef.current.dispose;
+    }, []);
+    return animRef.current;
+};
+export { useStepAnimation };

package/dist/util/timing.d.ts

@@ -0,0 +1,2 @@
+export declare function delay(e?: number): Promise<unknown>;
+//# sourceMappingURL=timing.d.ts.map

package/dist/util/timing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"timing.d.ts","sourceRoot":"","sources":["../../util/timing.ts"],"names":[],"mappings":"AAAA,wBAAgB,KAAK,CAAC,CAAC,SAAM,oBAE5B"}

package/dist/util/timing.js

@@ -0,0 +1,3 @@
+export function delay(e = 1e3) {
+    return new Promise((t) => setTimeout(t, e));
+}

package/dist/util/toasts.d.ts

@@ -0,0 +1,3 @@
+export declare const submitRegistrationNoCodeNonPristineError: () => string | number;
+export declare const submitRegistrationNoCodeError: () => string | number;
+//# sourceMappingURL=toasts.d.ts.map

package/dist/util/toasts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toasts.d.ts","sourceRoot":"","sources":["../../util/toasts.tsx"],"names":[],"mappings":"AAEA,eAAO,MAAM,wCAAwC,uBAQpD,CAAC;AAEF,eAAO,MAAM,6BAA6B,uBAIzC,CAAC"}

package/dist/util/toasts.js

@@ -0,0 +1,10 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { toast } from 'sonner';
+export const submitRegistrationNoCodeNonPristineError = () => {
+    return toast.error(_jsx("div", { children: "Your Hanzo Node is currently locked by existing keys, please restore your connection or reset your Hanzo Node Storage" }), { position: 'bottom-center' });
+};
+export const submitRegistrationNoCodeError = () => {
+    return toast.error(_jsx("div", { children: "Error connecting to your Hanzo Node" }), {
+        position: 'bottom-center',
+    });
+};

package/dist/util/two-way-map.d.ts

@@ -0,0 +1,9 @@
+declare class TwoWayReadonlyMap<T, K> {
+    map: Map<T, K>;
+    reverseMap: Map<K, T>;
+    constructor(map: Map<T, K>);
+    get(key: T): K | undefined;
+    revGet(key: K): T | undefined;
+}
+export default TwoWayReadonlyMap;
+//# sourceMappingURL=two-way-map.d.ts.map

package/dist/util/two-way-map.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"two-way-map.d.ts","sourceRoot":"","sources":["../../util/two-way-map.ts"],"names":[],"mappings":"AAAA,cAAM,iBAAiB,CAAC,CAAC,EAAE,CAAC;IAC1B,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACf,UAAU,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACV,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IAO1B,GAAG,CAAC,GAAG,EAAE,CAAC;IAGV,MAAM,CAAC,GAAG,EAAE,CAAC;CAGd;AAED,eAAe,iBAAiB,CAAA"}

package/dist/util/two-way-map.js

@@ -0,0 +1,16 @@
+class TwoWayReadonlyMap {
+    constructor(map) {
+        this.map = map;
+        this.reverseMap = new Map();
+        map.forEach((value, key) => {
+            this.reverseMap.set(value, key);
+        });
+    }
+    get(key) {
+        return this.map.get(key);
+    }
+    revGet(key) {
+        return this.reverseMap.get(key);
+    }
+}
+export default TwoWayReadonlyMap;

package/dist/util/use-mobile.d.ts

@@ -0,0 +1,2 @@
+export declare function useIsMobile(): boolean;
+//# sourceMappingURL=use-mobile.d.ts.map

package/dist/util/use-mobile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-mobile.d.ts","sourceRoot":"","sources":["../../util/use-mobile.ts"],"names":[],"mappings":"AAIA,wBAAgB,WAAW,YAc1B"}

package/dist/util/use-mobile.js

@@ -0,0 +1,15 @@
+import * as React from "react";
+const MOBILE_BREAKPOINT = 768;
+export function useIsMobile() {
+    const [isMobile, setIsMobile] = React.useState(undefined);
+    React.useEffect(() => {
+        const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`);
+        const onChange = () => {
+            setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
+        };
+        mql.addEventListener("change", onChange);
+        setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
+        return () => mql.removeEventListener("change", onChange);
+    }, []);
+    return !!isMobile;
+}

package/dist/utils.d.ts

@@ -0,0 +1,4 @@
+import { type ClassValue } from "clsx";
+export declare function cn(...inputs: ClassValue[]): string;
+export * from './src/utils';
+//# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAQ,MAAM,MAAM,CAAC;AAG7C,wBAAgB,EAAE,CAAC,GAAG,MAAM,EAAE,UAAU,EAAE,UAEzC;AAGD,cAAc,aAAa,CAAC"}

package/dist/utils.js

@@ -0,0 +1,7 @@
+import { clsx } from "clsx";
+import { twMerge } from "tailwind-merge";
+export function cn(...inputs) {
+    return twMerge(clsx(inputs));
+}
+// Re-export from src/utils for backward compatibility
+export * from './src/utils';

package/docs/css/aspen.css

@@ -0,0 +1,39 @@
+@import './colors/index.css';
+
+@theme {
+  --color-fd-background: hsl(75, 45%, 96%);
+  --color-fd-foreground: hsl(75, 35%, 18%);
+  --color-fd-primary: hsl(80, 60%, 40%);
+  --color-fd-primary-foreground: hsl(80, 100%, 16%);
+  --color-fd-border: hsla(80, 35%, 70%, 0.5);
+  --color-fd-ring: hsl(80, 60%, 40%);
+  --color-fd-accent: hsl(75, 50%, 90%);
+  --color-fd-accent-foreground: hsl(80, 60%, 22%);
+  --color-fd-muted: hsl(75, 40%, 92%);
+  --color-fd-muted-foreground: hsl(75, 25%, 45%);
+  --color-fd-secondary: hsl(80, 45%, 88%);
+  --color-fd-secondary-foreground: hsl(80, 50%, 18%);
+  --color-fd-card: hsl(75, 45%, 94%);
+  --color-fd-card-foreground: hsl(75, 35%, 18%);
+  --color-fd-popover: hsl(75, 45%, 97%);
+  --color-fd-popover-foreground: hsl(75, 35%, 18%);
+}
+
+.dark {
+  --color-fd-background: hsl(80, 25%, 7%);
+  --color-fd-foreground: hsl(75, 35%, 88%);
+  --color-fd-primary: hsl(80, 60%, 55%);
+  --color-fd-primary-foreground: hsl(80, 35%, 8%);
+  --color-fd-border: hsla(80, 35%, 35%, 0.35);
+  --color-fd-ring: hsl(80, 60%, 55%);
+  --color-fd-accent: hsl(80, 25%, 18%);
+  --color-fd-accent-foreground: hsl(80, 60%, 75%);
+  --color-fd-muted: hsl(80, 25%, 12%);
+  --color-fd-muted-foreground: hsl(75, 25%, 65%);
+  --color-fd-secondary: hsl(80, 25%, 16%);
+  --color-fd-secondary-foreground: hsl(75, 35%, 88%);
+  --color-fd-card: hsl(80, 25%, 10%);
+  --color-fd-card-foreground: hsl(75, 35%, 88%);
+  --color-fd-popover: hsl(80, 25%, 8%);
+  --color-fd-popover-foreground: hsl(75, 35%, 88%);
+}

package/docs/css/emerald.css

@@ -0,0 +1,39 @@
+@import './colors/index.css';
+
+@theme {
+  --color-fd-background: hsl(165, 45%, 96%);
+  --color-fd-foreground: hsl(165, 40%, 18%);
+  --color-fd-primary: hsl(168, 70%, 40%);
+  --color-fd-primary-foreground: hsl(168, 100%, 12%);
+  --color-fd-border: hsla(168, 40%, 70%, 0.5);
+  --color-fd-ring: hsl(168, 70%, 40%);
+  --color-fd-accent: hsl(165, 50%, 90%);
+  --color-fd-accent-foreground: hsl(168, 70%, 20%);
+  --color-fd-muted: hsl(165, 40%, 92%);
+  --color-fd-muted-foreground: hsl(165, 30%, 45%);
+  --color-fd-secondary: hsl(168, 45%, 88%);
+  --color-fd-secondary-foreground: hsl(168, 60%, 18%);
+  --color-fd-card: hsl(165, 45%, 94%);
+  --color-fd-card-foreground: hsl(165, 40%, 18%);
+  --color-fd-popover: hsl(165, 45%, 97%);
+  --color-fd-popover-foreground: hsl(165, 40%, 18%);
+}
+
+.dark {
+  --color-fd-background: hsl(200, 30%, 7%);
+  --color-fd-foreground: hsl(168, 40%, 88%);
+  --color-fd-primary: hsl(168, 70%, 60%);
+  --color-fd-primary-foreground: hsl(200, 40%, 8%);
+  --color-fd-border: hsla(168, 40%, 35%, 0.35);
+  --color-fd-ring: hsl(168, 70%, 60%);
+  --color-fd-accent: hsl(200, 30%, 18%);
+  --color-fd-accent-foreground: hsl(168, 70%, 75%);
+  --color-fd-muted: hsl(200, 30%, 12%);
+  --color-fd-muted-foreground: hsl(168, 25%, 65%);
+  --color-fd-secondary: hsl(200, 30%, 16%);
+  --color-fd-secondary-foreground: hsl(168, 40%, 88%);
+  --color-fd-card: hsl(200, 30%, 10%);
+  --color-fd-card-foreground: hsl(168, 40%, 88%);
+  --color-fd-popover: hsl(200, 30%, 8%);
+  --color-fd-popover-foreground: hsl(168, 40%, 88%);
+}

package/docs/css/ruby.css

@@ -0,0 +1,39 @@
+@import './colors/index.css';
+
+@theme {
+  --color-fd-background: hsl(0, 0%, 98%);
+  --color-fd-foreground: hsl(350, 45%, 14%);
+  --color-fd-primary: hsl(348, 85%, 45%);
+  --color-fd-primary-foreground: hsl(0, 0%, 100%);
+  --color-fd-border: hsla(348, 40%, 60%, 0.25);
+  --color-fd-ring: hsl(348, 85%, 45%);
+  --color-fd-accent: hsl(348, 70%, 95%);
+  --color-fd-accent-foreground: hsl(348, 70%, 22%);
+  --color-fd-muted: hsl(0, 0%, 94%);
+  --color-fd-muted-foreground: hsl(348, 25%, 42%);
+  --color-fd-secondary: hsl(348, 55%, 92%);
+  --color-fd-secondary-foreground: hsl(348, 50%, 20%);
+  --color-fd-card: hsl(0, 0%, 100%);
+  --color-fd-card-foreground: hsl(350, 45%, 14%);
+  --color-fd-popover: hsl(0, 0%, 100%);
+  --color-fd-popover-foreground: hsl(350, 45%, 14%);
+}
+
+.dark {
+  --color-fd-background: hsl(350, 30%, 6%);
+  --color-fd-foreground: hsl(350, 30%, 92%);
+  --color-fd-primary: hsl(348, 90%, 62%);
+  --color-fd-primary-foreground: hsl(350, 30%, 8%);
+  --color-fd-border: hsla(348, 40%, 45%, 0.25);
+  --color-fd-ring: hsl(348, 90%, 62%);
+  --color-fd-accent: hsl(348, 35%, 16%);
+  --color-fd-accent-foreground: hsl(348, 70%, 82%);
+  --color-fd-muted: hsl(350, 25%, 11%);
+  --color-fd-muted-foreground: hsl(348, 25%, 65%);
+  --color-fd-secondary: hsl(348, 30%, 14%);
+  --color-fd-secondary-foreground: hsl(350, 30%, 92%);
+  --color-fd-card: hsl(350, 30%, 9%);
+  --color-fd-card-foreground: hsl(350, 30%, 92%);
+  --color-fd-popover: hsl(350, 30%, 8%);
+  --color-fd-popover-foreground: hsl(350, 30%, 92%);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/ui",
-  "version": "5.3.33",
+  "version": "5.3.35",
   "description": "Multi-framework UI library with React, Vue, Svelte, and React Native support. Based on shadcn/ui with comprehensive framework coverage.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -45,29 +45,6 @@
     "sdk",
     "ui"
   ],
-  "scripts": {
-    "lat": "npm show @hanzo/ui version",
-    "pub": "npm publish",
-    "tc": "tsc --project tsconfig.build.json",
-    "build": "npm run clean && npm run build:minimal",
-    "build:minimal": "tsup --config tsup.config.minimal.ts",
-    "build:namespaces": "tsup --config tsup.config.namespaces.ts",
-    "build:full": "tsup --config tsup.config.production.ts",
-    "build:frameworks": "npm run build",
-    "build:watch": "tsup --watch",
-    "build:check": "tsc --project tsconfig.build.json --noEmit",
-    "clean": "rm -rf dist",
-    "prepublishOnly": "npm run build",
-    "update-registry": "node ./bin/update-registry.js",
-    "registry:mcp": "node ./bin/cli.js registry:mcp",
-    "registry:mcp:http": "node ./bin/cli.js registry:mcp --http",
-    "analyze:frameworks": "node analyze-frameworks.js",
-    "test": "vitest",
-    "test:ui": "vitest --ui",
-    "test:coverage": "vitest --coverage",
-    "test:jest": "jest test/multi-framework.test.js",
-    "test:frameworks": "jest test/multi-framework.test.js --verbose"
-  },
   "bin": {
     "hanzo-ui": "./bin/cli.js"
   },
@@ -78,6 +55,36 @@
       "import": "./dist/index.mjs",
       "require": "./dist/index.js"
     },
+    "./system": {
+      "types": "./dist/system/index.d.ts",
+      "import": "./dist/system/index.mjs",
+      "require": "./dist/system/index.js"
+    },
+    "./system/*": {
+      "types": "./dist/system/*.d.ts",
+      "import": "./dist/system/*.mjs",
+      "require": "./dist/system/*.js"
+    },
+    "./registry": {
+      "types": "./dist/src/registry/index.d.ts",
+      "import": "./dist/src/registry/index.mjs",
+      "require": "./dist/src/registry/index.js"
+    },
+    "./registry/*": {
+      "types": "./dist/registry/*.d.ts",
+      "import": "./dist/registry/*.mjs",
+      "require": "./dist/registry/*.js"
+    },
+    "./primitives/bases/tamagui": {
+      "types": "./dist/primitives/bases/tamagui/index.d.ts",
+      "import": "./dist/primitives/bases/tamagui/index.mjs",
+      "require": "./dist/primitives/bases/tamagui/index.js"
+    },
+    "./primitives/bases/tamagui/*": {
+      "types": "./dist/primitives/bases/tamagui/*.d.ts",
+      "import": "./dist/primitives/bases/tamagui/*.mjs",
+      "require": "./dist/primitives/bases/tamagui/*.js"
+    },
     "./calendar": {
       "types": "./dist/calendar.d.ts",
       "import": "./dist/calendar.mjs",
@@ -333,11 +340,6 @@
       "import": "./dist/primitives/index-common.mjs",
       "require": "./dist/primitives/index-common.js"
     },
-    "./registry": {
-      "types": "./dist/src/registry/index.d.ts",
-      "import": "./dist/src/registry/index.mjs",
-      "require": "./dist/src/registry/index.js"
-    },
     "./style/*": "./style/*",
     "./tailwind": {
       "types": "./dist/tailwind/index.d.ts",
@@ -519,6 +521,16 @@
       "import": "./dist/dock/*.mjs",
       "require": "./dist/dock/*.js"
     },
+    "./desktop": {
+      "types": "./dist/desktop/index.d.ts",
+      "import": "./dist/desktop/index.mjs",
+      "require": "./dist/desktop/index.js"
+    },
+    "./desktop/*": {
+      "types": "./dist/desktop/*.d.ts",
+      "import": "./dist/desktop/*.mjs",
+      "require": "./dist/desktop/*.js"
+    },
     "./project": {
       "types": "./dist/project/index.d.ts",
       "import": "./dist/project/index.mjs",
@@ -599,8 +611,7 @@
     }
   },
   "dependencies": {
-    "@hanzo/react-drawer": "^0.1.8",
-    "@next/third-parties": "^15.0.1",
+    "@next/third-parties": "^15.3.3",
     "@radix-ui/react-accordion": "^1.2.12",
     "@radix-ui/react-alert-dialog": "^1.1.15",
     "@radix-ui/react-aspect-ratio": "^1.1.7",
@@ -634,7 +645,7 @@
     "buffer": "^6.0.3",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "cmdk": "^0.2.0",
+    "cmdk": "^1.1.1",
     "commander": "^12.1.0",
     "embla-carousel-react": "^8.0.0",
     "input-otp": "^1.2.4",
@@ -649,7 +660,7 @@
     "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7",
     "tailwindcss-interaction-media": "^0.1.0",
-    "vaul": "^0.9.0",
+    "vaul": "^1.1.2",
     "zod": "^3.25.76",
     "zod-to-json-schema": "^3.23.2"
   },
@@ -665,10 +676,6 @@
     "@tanstack/react-table": "^8.0.0",
     "chrono-node": "^2.0.0",
     "date-fns": "^3.0.0",
-    "react-day-picker": "^9.0.0",
-    "react-hook-form": "^7.0.0",
-    "react-resizable-panels": "^1.0.0",
-    "recharts": "^2.0.0",
     "framer-motion": "^11.0.0",
     "lucide-react": "0.456.0",
     "mermaid": "^10.0.0",
@@ -676,12 +683,20 @@
     "next": ">=14.2.16",
     "next-themes": "^0.2.1 || ^0.3.0 || ^0.4.0",
     "react": "^18.0.0 || ^19.0.0",
+    "react-day-picker": "^9.0.0",
     "react-dom": "^18.0.0 || ^19.0.0",
+    "react-hook-form": "^7.0.0",
     "react-qrcode-logo": "^2.0.0",
+    "react-resizable-panels": "^1.0.0",
+    "recharts": "^2.0.0",
     "sql.js": "^1.0.0",
+    "styled-components": "^6.0.0",
     "validator": "^13.11.0"
   },
   "peerDependenciesMeta": {
+    "styled-components": {
+      "optional": true
+    },
     "@dnd-kit/core": {
       "optional": true
     },
@@ -760,6 +775,7 @@
     "@mdx-js/react": "^3.0.0",
     "@radix-ui/react-primitive": "^2.1.3",
     "@splinetool/react-spline": "^4.0.0",
+    "@tailwindcss/postcss": "^4.1.16",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.0",
     "@types/facebook-pixel": "^0.0.30",
@@ -770,6 +786,7 @@
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.0",
     "@types/react-syntax-highlighter": "^15.5.13",
+    "@types/styled-components": "^5.1.36",
     "@vitejs/plugin-react": "^5.0.4",
     "@vitest/coverage-v8": "^4.0.6",
     "@vitest/ui": "^4.0.6",
@@ -784,11 +801,33 @@
     "rehype-katex": "^7.0.1",
     "remark-gfm": "^4.0.1",
     "remark-math": "^6.0.0",
-    "@tailwindcss/postcss": "^4.1.16",
+    "styled-components": "^6.3.8",
     "tailwindcss": "^4.1.16",
-    "tw-animate-css": "^1.2.9",
     "tsup": "^8.5.0",
+    "tw-animate-css": "^1.2.9",
     "typescript": "5.6.3",
     "vitest": "4.0.6"
+  },
+  "scripts": {
+    "lat": "npm show @hanzo/ui version",
+    "pub": "npm publish",
+    "tc": "tsc --project tsconfig.build.json",
+    "build": "npm run clean && npm run build:minimal && npm run tc",
+    "build:minimal": "tsup --config tsup.config.minimal.ts",
+    "build:namespaces": "tsup --config tsup.config.namespaces.ts",
+    "build:full": "tsup --config tsup.config.production.ts",
+    "build:frameworks": "npm run build",
+    "build:watch": "tsup --watch",
+    "build:check": "tsc --project tsconfig.build.json --noEmit",
+    "clean": "rm -rf dist",
+    "update-registry": "node ./bin/update-registry.js",
+    "registry:mcp": "node ./bin/cli.js registry:mcp",
+    "registry:mcp:http": "node ./bin/cli.js registry:mcp --http",
+    "analyze:frameworks": "node analyze-frameworks.js",
+    "test": "vitest",
+    "test:ui": "vitest --ui",
+    "test:coverage": "vitest --coverage",
+    "test:jest": "jest test/multi-framework.test.js",
+    "test:frameworks": "jest test/multi-framework.test.js --verbose"
   }
-}
+}