@modul/mbui 0.0.4-beta-pv-52770-fix-e1e0ffc2 → 0.0.4-beta-pv-52894-41248341

package/dist/Logo/Logo.js

@@ -2,10 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = (0, tslib_1.__importDefault)(require("react"));
-// @ts-ignore
+/* @ts-ignore */
 const logo_svg_1 = (0, tslib_1.__importDefault)(require("../assets/images/logo/bank/logo.svg"));
-const Logo = ({ variant = logo_svg_1.default, width = 132, height = 32, className }) => {
-    return react_1.default.createElement("img", { className: className, src: variant, width: width, height: height });
+const LOGOS = {
+    bank: {
+        src: logo_svg_1.default,
+        width: 132,
+        height: 32,
+        alt: 'Модульбанк',
+    },
+};
+const Logo = ({ variant = logo_svg_1.default, width, height, alt, className }) => {
+    return (react_1.default.createElement("img", { className: className, src: LOGOS[variant].src, width: LOGOS[variant].width || width, height: LOGOS[variant].height || height, alt: LOGOS[variant].alt || alt }));
 };
 exports.default = Logo;
 //# sourceMappingURL=Logo.js.map

package/dist/Logo/Logo.js.map

@@ -1 +1 @@
-{"version":3,"file":"Logo.js","sourceRoot":"","sources":["../../src/Logo/Logo.tsx"],"names":[],"mappings":";;;AAAA,+DAAyB;AACzB,aAAa;AACb,gGAAsD;AAStD,MAAM,IAAI,GAAwB,CAAC,EAAC,OAAO,GAAG,kBAAI,EAAE,KAAK,GAAG,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,SAAS,EAAC,EAAE,EAAE;IAC3F,OAAO,uCAAK,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAI,CAAA;AACjF,CAAC,CAAA;AAED,kBAAe,IAAI,CAAA"}
+{"version":3,"file":"Logo.js","sourceRoot":"","sources":["../../src/Logo/Logo.tsx"],"names":[],"mappings":";;;AAAA,+DAAyB;AACzB,gBAAgB;AAChB,gGAAsD;AAWtD,MAAM,KAAK,GAAG;IACb,IAAI,EAAE;QACL,GAAG,EAAE,kBAAI;QACT,KAAK,EAAE,GAAG;QACV,MAAM,EAAE,EAAE;QACV,GAAG,EAAE,YAAY;KACjB;CACD,CAAA;AAED,MAAM,IAAI,GAAwB,CAAC,EAAE,OAAO,GAAG,kBAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE;IACvF,OAAO,CACN,uCACC,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,EACvB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,KAAK,EACpC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,MAAM,EACvC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,GAAG,GAC7B,CACF,CAAA;AACF,CAAC,CAAA;AAED,kBAAe,IAAI,CAAA"}

package/dist/index.d.ts

@@ -4,11 +4,11 @@ import { Slider } from "./Slider";
 import { Popover } from "./Popover";
 import Logo from "./Logo";
 import { InputOTP, InputOTPGroup, InputOTPSlot, InputOTPSeparator } from "./Input-OTP";
-import { ButtonNavigation } from "./components/ButtonNavigation";
-import * as Icon from "./components/SvgIcon/icons";
-import { Collapse } from "./Collapse";
-import { Button } from "./Base/Buttons";
+import { BottomNavigation } from "./BottomNavigation";
+import * as Icon from "./Icon";
+import { Collapsible } from "./Collapsible";
+import { Button } from "./Button";
 import { Input } from "./Base/Input";
 import { Audio } from "./Audio";
 import { cn } from "./@/lib/utils";
-export { Tooltip, Tabs, Slider, Popover, Logo, InputOTP, InputOTPGroup, InputOTPSlot, InputOTPSeparator, Collapse, Button, Input, Audio, cn, ButtonNavigation, Icon, };
+export { Tooltip, Tabs, Slider, Popover, Logo, InputOTP, InputOTPGroup, InputOTPSlot, InputOTPSeparator, Collapsible, Button, Input, Audio, cn, BottomNavigation, Icon, };

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Icon = exports.ButtonNavigation = exports.cn = exports.Audio = exports.Input = exports.Button = exports.Collapse = exports.InputOTPSeparator = exports.InputOTPSlot = exports.InputOTPGroup = exports.InputOTP = exports.Logo = exports.Popover = exports.Slider = exports.Tabs = exports.Tooltip = void 0;
+exports.Icon = exports.BottomNavigation = exports.cn = exports.Audio = exports.Input = exports.Button = exports.Collapsible = exports.InputOTPSeparator = exports.InputOTPSlot = exports.InputOTPGroup = exports.InputOTP = exports.Logo = exports.Popover = exports.Slider = exports.Tabs = exports.Tooltip = void 0;
 const tslib_1 = require("tslib");
 const Tooltip_1 = require("./Tooltip");
 Object.defineProperty(exports, "Tooltip", { enumerable: true, get: function () { return Tooltip_1.Tooltip; } });
@@ -17,14 +17,14 @@ Object.defineProperty(exports, "InputOTP", { enumerable: true, get: function ()
 Object.defineProperty(exports, "InputOTPGroup", { enumerable: true, get: function () { return Input_OTP_1.InputOTPGroup; } });
 Object.defineProperty(exports, "InputOTPSlot", { enumerable: true, get: function () { return Input_OTP_1.InputOTPSlot; } });
 Object.defineProperty(exports, "InputOTPSeparator", { enumerable: true, get: function () { return Input_OTP_1.InputOTPSeparator; } });
-const ButtonNavigation_1 = require("./components/ButtonNavigation");
-Object.defineProperty(exports, "ButtonNavigation", { enumerable: true, get: function () { return ButtonNavigation_1.ButtonNavigation; } });
-const Icon = (0, tslib_1.__importStar)(require("./components/SvgIcon/icons"));
+const BottomNavigation_1 = require("./BottomNavigation");
+Object.defineProperty(exports, "BottomNavigation", { enumerable: true, get: function () { return BottomNavigation_1.BottomNavigation; } });
+const Icon = (0, tslib_1.__importStar)(require("./Icon"));
 exports.Icon = Icon;
-const Collapse_1 = require("./Collapse");
-Object.defineProperty(exports, "Collapse", { enumerable: true, get: function () { return Collapse_1.Collapse; } });
-const Buttons_1 = require("./Base/Buttons");
-Object.defineProperty(exports, "Button", { enumerable: true, get: function () { return Buttons_1.Button; } });
+const Collapsible_1 = require("./Collapsible");
+Object.defineProperty(exports, "Collapsible", { enumerable: true, get: function () { return Collapsible_1.Collapsible; } });
+const Button_1 = require("./Button");
+Object.defineProperty(exports, "Button", { enumerable: true, get: function () { return Button_1.Button; } });
 const Input_1 = require("./Base/Input");
 Object.defineProperty(exports, "Input", { enumerable: true, get: function () { return Input_1.Input; } });
 const Audio_1 = require("./Audio");

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,uCAAoC;AAenC,wFAfQ,iBAAO,OAeR;AAdR,iCAA8B;AAe7B,qFAfQ,WAAI,OAeR;AAdL,qCAAkC;AAejC,uFAfQ,eAAM,OAeR;AAdP,uCAAoC;AAenC,wFAfQ,iBAAO,OAeR;AAdR,+DAA0B;AAezB,eAfM,cAAI,CAeN;AAdL,2CAAuF;AAetF,yFAfQ,oBAAQ,OAeR;AACR,8FAhBkB,yBAAa,OAgBlB;AACb,6FAjBiC,wBAAY,OAiBjC;AACZ,kGAlB+C,6BAAiB,OAkB/C;AAjBlB,oEAAiE;AAuBhE,iGAvBQ,mCAAgB,OAuBR;AAtBjB,8EAAmD;AAuBlD,oBAAI;AAtBL,yCAAsC;AAgBrC,yFAhBQ,mBAAQ,OAgBR;AAfT,4CAAwC;AAgBvC,uFAhBQ,gBAAM,OAgBR;AAfP,wCAAqC;AAgBpC,sFAhBQ,aAAK,OAgBR;AAfN,mCAAgC;AAgB/B,sFAhBQ,aAAK,OAgBR;AAfN,yCAAmC;AAgBlC,mFAhBQ,UAAE,OAgBR"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,uCAAoC;AAenC,wFAfQ,iBAAO,OAeR;AAdR,iCAA8B;AAe7B,qFAfQ,WAAI,OAeR;AAdL,qCAAkC;AAejC,uFAfQ,eAAM,OAeR;AAdP,uCAAoC;AAenC,wFAfQ,iBAAO,OAeR;AAdR,+DAA0B;AAezB,eAfM,cAAI,CAeN;AAdL,2CAAuF;AAetF,yFAfQ,oBAAQ,OAeR;AACR,8FAhBkB,yBAAa,OAgBlB;AACb,6FAjBiC,wBAAY,OAiBjC;AACZ,kGAlB+C,6BAAiB,OAkB/C;AAjBlB,yDAAsD;AAuBrD,iGAvBQ,mCAAgB,OAuBR;AAtBjB,0DAA+B;AAuB9B,oBAAI;AAtBL,+CAA4C;AAgB3C,4FAhBQ,yBAAW,OAgBR;AAfZ,qCAAkC;AAgBjC,uFAhBQ,eAAM,OAgBR;AAfP,wCAAqC;AAgBpC,sFAhBQ,aAAK,OAgBR;AAfN,mCAAgC;AAgB/B,sFAhBQ,aAAK,OAgBR;AAfN,yCAAmC;AAgBlC,mFAhBQ,UAAE,OAgBR"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modul/mbui",
-  "version": "0.0.4-beta-pv-52770-fix-e1e0ffc2",
+  "version": "0.0.4-beta-pv-52894-41248341",
   "packageManager": "yarn@3.5.1",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -34,7 +34,6 @@
     "clsx": "^2.1.1",
     "input-otp": "1.2.4",
     "lodash": "4.17.5",
-    "lucide-react": "^0.400.0",
     "react-datepicker": "4.16.0",
     "react-imask": "7.1.3",
     "tailwind-merge": "^2.3.0",

package/src/@/config/index.ts

@@ -4,6 +4,7 @@ export default {
 		container: {},
 		extend: {
 			colors: {
+				muted: 'var(--muted)',
 				primary: {
 					DEFAULT: 'var(--primary)',
 					hover: 'var(--primary-hover)',
@@ -27,13 +28,13 @@ export default {
 			},
 			...button,
 			// textColor: {
-				// base: 'var(--text-cl)',
-				// 'btn-primary': 'var(--btn-primary-cl)',
-				// 'btn-success': 'var(--btn-success-cl)',
-				// primary: 'var(--btn-txt-primary)',
-				// 'primary-hover': 'var(--btn-txt-primary-hover)',
-				// 'primary-focus': 'var(--btn-txt-primary-focus)',
-				// 'primary-active': 'var(--btn-txt-primary-active)',
+			// 	base: 'var(--text-cl)',
+			// 	'btn-primary': 'var(--btn-primary-cl)',
+			// 	'btn-success': 'var(--btn-success-cl)',
+			// 	primary: 'var(--btn-txt-primary)',
+			// 	'primary-hover': 'var(--btn-txt-primary-hover)',
+			// 	'primary-focus': 'var(--btn-txt-primary-focus)',
+			// 	'primary-active': 'var(--btn-txt-primary-active)',
 			// },
 
 			// border: {

package/src/BottomNavigation/BottomNavigation.tsx

@@ -0,0 +1,51 @@
+import * as React from "react"
+import { Home, Services, ChatSolid, Clock, Payment } from "../Icon";
+
+const btnClasses = "block hover:bg-btn-ghost-hover focus:bg-btn-ghost-focus active:bg-btn-ghost-active p-[8px] w-full text-[10px] text-center hover:text-primary leading-[1.33] transition duration-300";
+const iconClasses = "block mx-auto mb-[8px]";
+
+const BottomNavigation = React.forwardRef(
+  ({ className, ...props } : {className: string}, ref) => {
+
+    return (
+		<nav className="">
+			<ul role="list" className="grid grid-flow-col">
+				<li className="">
+					<a className={btnClasses} href="">
+						<Home width="24px" height="24px" fill="red" className="block mx-auto mb-[8px]"/>
+						Главная
+					</a>
+				</li>
+				<li className="">
+					<a className={btnClasses} href="">
+						<Payment width="24px" height="24px" className={iconClasses}/>
+						Платежи
+					</a>
+				</li>
+				<li className="">
+					<a className={btnClasses} href="">
+						<Clock width="24px" height="24px" className={iconClasses}/>
+						История
+					</a>
+				</li>
+				<li className="">
+					<a className={btnClasses} href="">
+						<Services width="24px" height="24px" className={iconClasses}/>
+						Сервисы
+					</a>
+				</li>
+				<li className="">
+					<button className={btnClasses}>
+						<ChatSolid width="24px" height="24px" className={iconClasses}/>
+						Чат
+					</button>
+				</li>
+			</ul>
+		</nav>
+    )
+  }
+)
+
+BottomNavigation.displayName = "BottomNavigation"
+
+export { BottomNavigation }

package/src/BottomNavigation/index.ts

@@ -0,0 +1,6 @@
+import { BottomNavigation } from './BottomNavigation'
+
+export { BottomNavigation }
+
+export default BottomNavigation
+

package/src/Button/Button.tsx

@@ -0,0 +1,78 @@
+import * as React from 'react'
+import { Slot } from '@radix-ui/react-slot'
+import { cva, type VariantProps } from 'class-variance-authority'
+
+import { cn } from '../@/lib/utils'
+// import { cn } from "@/lib/utils" порешать с алиасами
+
+const buttonVariants = cva(
+	'inline-flex items-center border-[2px] justify-center whitespace-nowrap font-medium transition-colors focus-visible:outline-none focus-visible:ring ring-offset-1 disabled:pointer-events-none disabled:opacity-[.24]',
+	{
+		variants: {
+			variant: {
+				primary:
+					'text-btn-primary bg-btn-primary hover:bg-btn-primary-hover focus:bg-btn-primary-focus active:bg-btn-primary-active border-btn-primary hover:border-btn-primary-hover focus:border-btn-primary-focus active:border-btn-primary-active',
+				secondary:
+					'text-btn-secondary bg-btn-secondary hover:bg-btn-secondary-hover focus:bg-btn-secondary-focus active:bg-btn-secondary-active border-btn-secondary hover:border-btn-secondary-hover focus:border-btn-secondary-focus active:border-btn-secondary-active',
+				success:
+					'text-btn-success bg-btn-success hover:bg-btn-success-hover focus:bg-btn-success-focus active:bg-btn-success-active border-btn-success hover:border-btn-success-hover focus:border-btn-success-focus active:border-btn-success-active',
+				'primary-outline':
+					'text-btn-primary-outline hover:text-btn-primary-outline-hover focus:text-btn-primary-outline-focus active:text-btn-primary-outline-active bg-btn-primary-outline hover:bg-btn-primary-outline-hover focus:bg-btn-primary-outline-focus active:bg-btn-primary-outline-active border-btn-primary-outline hover:border-btn-primary-outline-hover focus:border-btn-primary-outline-focus active:border-btn-primary-outline-active',
+				outline: 'border-[1px] text-btn-outline border-btn-outline ring-[currentColor]',
+				ghost: 'text-btn-ghost bg-btn-ghost hover:bg-btn-ghost-hover focus:bg-btn-ghost-focus active:bg-btn-ghost-active border-transparent',
+				// link: 	 'text-primary underline-offset-4 hover:underline',
+			},
+			size: {
+				lg: 'h-[52px] px-[32px] text-[16px] leading-[1.08] rounded-[4px]',
+				md: 'h-[44px] px-[24px] text-[14px] leading-[1.08] rounded-[4px]',
+				sm: 'h-[36px] px-[20px] text-[12px] leading-none rounded-[3px]',
+				xs: 'h-[28px] px-[12px] text-[11px] leading-none rounded-[2px]',
+				xxs: 'h-[20px] px-[8px] text-[9px] leading-none rounded-[2px]',
+			},
+		},
+		defaultVariants: {
+			variant: 'primary',
+			size: 'md',
+		},
+	}
+)
+const textVariants = cva(
+	'inline-flex whitespace-nowrap transition-colors focus-visible:outline-current rounded-[.25em] disabled:pointer-events-none disabled:opacity-[.24]',
+	{
+		variants: {
+			variant: {
+				primary:
+					'text-primary hover:text-primary-hover focus:text-primary-focus active:text-primary-active disabled:pointer-events-none',
+			},
+		},
+		defaultVariants: {
+			variant: 'primary',
+		},
+	}
+)
+
+export interface ButtonProps
+	extends React.ButtonHTMLAttributes<HTMLButtonElement>,
+		VariantProps<typeof buttonVariants> {
+	asChild?: boolean
+	asText?: boolean
+}
+
+const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
+  ({ className, variant, size, asText = false, asChild = false, ...props }, ref) => {
+    const Comp = asChild ? Slot : "button"
+	// @ts-ignore
+	const classes = asText ? textVariants<any>({ variant, className }) : buttonVariants({ variant, size, className });
+    return (
+      <Comp
+        className={cn(classes)}
+        ref={ref}
+        {...props}
+      />
+    )
+  }
+)
+
+Button.displayName = 'Button'
+
+export { Button, buttonVariants }

package/src/Button/index.ts

@@ -0,0 +1 @@
+export {Button} from './Button'

package/src/Collapsible/AccountCollapsible.tsx

@@ -0,0 +1,55 @@
+import React, { FC, ReactNode } from 'react'
+import * as CollapsiblePrimitive from '@radix-ui/react-collapsible'
+import { DropdownSmallOld } from '../../src/Icon'
+import { cn } from '../@/lib/utils'
+
+const AccountCollapsible = CollapsiblePrimitive.Root
+
+const AccountCollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger
+
+const AccountCollapsibleContent = CollapsiblePrimitive.CollapsibleContent
+
+export type AccountCollapsibleHeaderProps = {
+	label: ReactNode
+}
+export type AccountCollapsibleContentItemProps = {
+	className?: string
+	children: ReactNode
+}
+
+const AccountCollapsibleHeader: FC<AccountCollapsibleHeaderProps> = ({ label }) => {
+	return (
+		<div className="flex justify-between py-[4px] text-muted">
+			<div className="font-medium text-[12px] leading-[1.3]">{label}</div>
+			<AccountCollapsibleTrigger className="p-[4px] data-[state=open]:rotate-180 transition-transform">
+				<DropdownSmallOld />
+			</AccountCollapsibleTrigger>
+		</div>
+	)
+}
+const AccountCollapsibleContentItem: FC<AccountCollapsibleContentItemProps> = ({ children, className, ...props }) => (
+	<a
+		href=""
+		className={cn(
+			'text-left w-full rounded-[4px] px-[12px] py-[16px] bg-btn-secondary hover:bg-btn-secondary-hover focus:bg-btn-secondary-focus active:bg-btn-secondary-active border-btn-secondary hover:border-btn-secondary-hover focus:border-btn-secondary-focus active:border-btn-secondary-active',
+			className
+		)}
+		{...props}
+	>
+		{children}
+	</a>
+)
+
+AccountCollapsible.displayName = 'AccountCollaspible'
+AccountCollapsibleTrigger.displayName = 'AccountCollaspibleTrigger'
+AccountCollapsibleHeader.displayName = 'AccountCollapsibleHeader'
+AccountCollapsibleContent.displayName = 'AccountCollaspibleContent'
+AccountCollapsibleContentItem.displayName = 'AccountCollapsibleContentItem'
+
+export {
+	AccountCollapsible,
+	AccountCollapsibleHeader,
+	AccountCollapsibleTrigger,
+	AccountCollapsibleContent,
+	AccountCollapsibleContentItem,
+}

package/src/Collapsible/Collapse1 copy.tsx

@@ -0,0 +1,88 @@
+import React from 'react'
+import cn from 'clsx'
+import * as Accordion from '@radix-ui/react-accordion'
+import {
+	AccordionMultipleProps,
+	AccordionSingleProps,
+	AccordionContent,
+	AccordionHeader,
+	AccordionItem,
+	AccordionTrigger
+} from "@radix-ui/react-accordion";
+
+type CollapseComponents = {
+	Item: typeof AccordionItem,
+	Header: typeof AccordionHeader,
+	Trigger: typeof AccordionTrigger,
+	Content: typeof AccordionContent,
+}
+
+const Collapse: React.FC<AccordionSingleProps | AccordionMultipleProps> & CollapseComponents = ({...props}) => <Accordion.Root {...props}/>
+
+const CollapseItem = React.forwardRef<
+	React.ElementRef<typeof Accordion.Item>,
+	React.ComponentPropsWithoutRef<typeof Accordion.Item>
+>(({ className, ...props }, ref) => (
+	<Accordion.Item
+		ref={ref}
+		className={cn('border-b', className)}
+		{...props}
+	/>
+))
+
+const CollapseHeader = React.forwardRef<
+	React.ElementRef<typeof Accordion.Header>,
+	React.ComponentPropsWithoutRef<typeof Accordion.Header>
+>(({ className, children, ...props }, ref) => (
+	<Accordion.Header
+		className={cn('flex', className)}
+		{...props}
+		ref={ref}
+	>
+		{children}
+	</Accordion.Header>
+))
+
+const CollapseTrigger = React.forwardRef<
+	React.ElementRef<typeof Accordion.Trigger>,
+	React.ComponentPropsWithoutRef<typeof Accordion.Trigger>
+>(({ className, children, ...props }, ref) => (
+	<Accordion.Trigger
+		ref={ref}
+		className={cn(
+			'flex flex-1 items-center justify-between py-4 font-medium transition-all hover:underline [&[data-state=open]>svg]:rotate-180',
+			className
+		)}
+		{...props}
+	>
+		{children}
+		{/*<ChevronDown className="w-4 h-4 transition-transform duration-200 shrink-0" />*/}
+	</Accordion.Trigger>
+))
+
+const CollapseContent = React.forwardRef<
+	React.ElementRef<typeof Accordion.Content>,
+	React.ComponentPropsWithoutRef<typeof Accordion.Content>
+>(({ className, children, ...props }, ref) => (
+	<Accordion.Content
+		ref={ref}
+		className={cn(
+			'overflow-hidden text-sm transition-all data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down',
+			className
+		)}
+		{...props}
+	>
+		{children}
+	</Accordion.Content>
+))
+
+Collapse.Item = CollapseItem
+CollapseItem.displayName = "CollapseItem"
+Collapse.Header = CollapseHeader
+CollapseHeader.displayName = "CollapseHeader"
+Collapse.Trigger = CollapseTrigger
+CollapseTrigger.displayName = "CollapseTrigger"
+Collapse.Content = CollapseContent
+CollapseContent.displayName = "CollapseContent"
+
+export default Collapse

package/src/Collapsible/Collapsible.tsx

@@ -0,0 +1,13 @@
+import * as CollapsiblePrimitive from '@radix-ui/react-collapsible'
+
+const Collapsible = CollapsiblePrimitive.Root
+
+const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger
+
+const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent
+
+Collapsible.displayName = 'Collapsible'
+CollapsibleTrigger.displayName = 'CollapsibleTrigger'
+CollapsibleContent.displayName = 'CollapsibleContent'
+
+export { Collapsible, CollapsibleTrigger, CollapsibleContent }

package/src/Collapsible/index.ts

@@ -0,0 +1 @@
+export { Collapsible, CollapsibleTrigger, CollapsibleContent } from './Collapsible'

package/src/Icon/index.ts

@@ -0,0 +1,2 @@
+export * from './icons'
+

package/src/Logo/Logo.tsx

@@ -1,16 +1,35 @@
 import React from 'react'
-// @ts-ignore
+/* @ts-ignore */
 import bank from '../assets/images/logo/bank/logo.svg'
+/* @ts-ignore */
 // import kassa from '../assets/images/logo/kassa/logo.svg'
+/* @ts-ignore */
 // import garant from '../assets/images/logo/garant/logo.svg'
 
-interface LogoProps extends React.ImgHTMLAttributes<HTMLImageElement>{
-	variant?: 'bank' | 'kassa' | 'garant',
-	className?: string
+interface LogoProps extends React.ImgHTMLAttributes<HTMLImageElement> {
+	variant?: bank
+	// variant?: bank | kassa | garant
 }
 
-const Logo: React.FC<LogoProps> = ({variant = bank, width = 132, height = 32, className}) => {
-	return <img className={className} src={variant} width={width} height={height} />
+const LOGOS = {
+	bank: {
+		src: bank,
+		width: 132,
+		height: 32,
+		alt: 'Модульбанк',
+	},
+}
+
+const Logo: React.FC<LogoProps> = ({ variant = bank, width, height, alt, className }) => {
+	return (
+		<img
+			className={className}
+			src={LOGOS[variant].src}
+			width={LOGOS[variant].width || width}
+			height={LOGOS[variant].height || height}
+			alt={LOGOS[variant].alt || alt}
+		/>
+	)
 }
 
 export default Logo

package/src/Navbar/Navbar.tsx

@@ -0,0 +1,21 @@
+import * as React from "react"
+import cn from "clsx";
+
+export interface Navbar {
+	className?: string
+}
+
+const Navbar = React.forwardRef<Navbar>(
+  ({ className, ...props }, ref) => {
+
+    return (
+		<div className={cn('h-[44px]', className)}>
+
+		</div>
+    )
+  }
+)
+
+Navbar.displayName = "Navbar"
+
+export { Navbar }

package/src/Navbar/index.tsx

@@ -0,0 +1,2 @@
+export { Navbar } from "./Navbar"
+

package/src/assets/css/global.css

@@ -4,7 +4,7 @@
 
 @layer base {
 
-    /* @font-face {
+    @font-face {
         font-weight: 100 900;
         font-family: "Roboto";
         font-style: normal;
@@ -20,7 +20,7 @@
         font-stretch: 75% 100%;
         src: url("../fonts/Roboto-Italic.woff2") format("woff2");
         font-display: swap;
-    } */
+    }
 
     :root {
         font-family: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, "Noto Sans", sans-serif; 
@@ -73,12 +73,12 @@
         --cl-red-6: #f9c1bd;
         --cl-red-7: #ffe9e9;
 
-        --text-cl: var(--cl-graphite-1);
-        --text-primary-cl: var(--cl-blue-2);
-        /* --text-success-cl: var(--cl-graphite-1); */
-        --text-seconady-cl: var(--cl-graphite-2);
-        --text-tertiary-cl: var(--cl-graphite-3);
-        /* --tetx-tertiary:; */
+        /* --text-base: var(--cl-graphite-1); */
+        --primary: var(--cl-blue-2);
+        --success: var(--cl-graphite-1);
+        --seconady: var(--cl-graphite-2);
+        --tertiary: var(--cl-graphite-3);
+        --muted: var(--cl-graphite-3);
         /* --text-quaternary:; */
 
         --app-bg: var(--cl-white);

package/src/index.ts

@@ -4,10 +4,10 @@ import { Slider } from "./Slider";
 import { Popover } from "./Popover";
 import Logo from "./Logo";
 import { InputOTP, InputOTPGroup, InputOTPSlot, InputOTPSeparator } from "./Input-OTP";
-import { ButtonNavigation } from "./components/ButtonNavigation";
-import * as Icon from "./components/SvgIcon/icons";
-import { Collapse } from "./Collapse";
-import { Button } from "./Base/Buttons";
+import { BottomNavigation } from "./BottomNavigation";
+import * as Icon from "./Icon";
+import { Collapsible } from "./Collapsible";
+import { Button } from "./Button";
 import { Input } from "./Base/Input";
 import { Audio } from "./Audio";
 import { cn } from "./@/lib/utils";
@@ -22,11 +22,11 @@ export {
 	InputOTPGroup,
 	InputOTPSlot,
 	InputOTPSeparator,
-	Collapse,
+	Collapsible,
 	Button,
 	Input,
 	Audio,
 	cn,
-	ButtonNavigation,
+	BottomNavigation,
 	Icon,
 };

package/dist/Base/Buttons/Button.d.ts

@@ -1,12 +0,0 @@
-import * as React from "react";
-import { type VariantProps } from "class-variance-authority";
-declare const buttonVariants: (props?: {
-    variant?: "outline" | "success" | "primary" | "secondary" | "primary-outline" | "ghost";
-    size?: "lg" | "md" | "sm" | "xs" | "xxs";
-} & import("class-variance-authority/dist/types").ClassProp) => string;
-export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement>, VariantProps<typeof buttonVariants> {
-    asChild?: boolean;
-    asText?: boolean;
-}
-declare const Button: React.ForwardRefExoticComponent<ButtonProps & React.RefAttributes<HTMLButtonElement>>;
-export { Button, buttonVariants };

package/dist/Base/Buttons/Button.js

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buttonVariants = exports.Button = void 0;
-const tslib_1 = require("tslib");
-const React = (0, tslib_1.__importStar)(require("react"));
-const react_slot_1 = require("@radix-ui/react-slot");
-const class_variance_authority_1 = require("class-variance-authority");
-const utils_1 = require("../../@/lib/utils");
-// import { cn } from "@/lib/utils" порешать с алиасами
-const buttonVariants = (0, class_variance_authority_1.cva)('inline-flex items-center border-[2px] justify-center whitespace-nowrap font-medium transition-colors focus-visible:outline-none focus-visible:ring ring-offset-1 disabled:pointer-events-none disabled:opacity-[.24]', {
-    variants: {
-        variant: {
-            primary: 'text-btn-primary bg-btn-primary hover:bg-btn-primary-hover focus:bg-btn-primary-focus active:bg-btn-primary-active border-btn-primary hover:border-btn-primary-hover focus:border-btn-primary-focus active:border-btn-primary-active',
-            secondary: 'text-btn-secondary bg-btn-secondary hover:bg-btn-secondary-hover focus:bg-btn-secondary-focus active:bg-btn-secondary-active border-btn-secondary hover:border-btn-secondary-hover focus:border-btn-secondary-focus active:border-btn-secondary-active',
-            success: 'text-btn-success bg-btn-success hover:bg-btn-success-hover focus:bg-btn-success-focus active:bg-btn-success-active border-btn-success hover:border-btn-success-hover focus:border-btn-success-focus active:border-btn-success-active',
-            'primary-outline': 'text-btn-primary-outline hover:text-btn-primary-outline-hover focus:text-btn-primary-outline-focus active:text-btn-primary-outline-active bg-btn-primary-outline hover:bg-btn-primary-outline-hover focus:bg-btn-primary-outline-focus active:bg-btn-primary-outline-active border-btn-primary-outline hover:border-btn-primary-outline-hover focus:border-btn-primary-outline-focus active:border-btn-primary-outline-active',
-            outline: 'border-[1px] text-btn-outline border-btn-outline ring-[currentColor]',
-            ghost: 'text-btn-ghost bg-btn-ghost hover:bg-btn-ghost-hover focus:bg-btn-ghost-focus active:bg-btn-ghost-active border-transparent',
-            // link: 	 'text-primary underline-offset-4 hover:underline',
-        },
-        size: {
-            lg: 'h-[52px] px-[32px] text-[16px] leading-[1.08] rounded-[4px]',
-            md: 'h-[44px] px-[24px] text-[14px] leading-[1.08] rounded-[4px]',
-            sm: 'h-[36px] px-[20px] text-[12px] leading-none rounded-[3px]',
-            xs: 'h-[28px] px-[12px] text-[11px] leading-none rounded-[2px]',
-            xxs: 'h-[20px] px-[8px] text-[9px] leading-none rounded-[2px]'
-        }
-    },
-    defaultVariants: {
-        variant: 'primary',
-        size: 'md',
-    },
-});
-exports.buttonVariants = buttonVariants;
-const textVariants = (0, class_variance_authority_1.cva)('inline-flex whitespace-nowrap transition-colors focus-visible:outline-current rounded-[.25em] disabled:pointer-events-none disabled:opacity-[.24]', {
-    variants: {
-        variant: {
-            primary: 'text-primary hover:text-primary-hover focus:text-primary-focus active:text-primary-active disabled:pointer-events-none',
-        }
-    },
-    defaultVariants: {
-        variant: 'primary'
-    },
-});
-const Button = React.forwardRef(({ className, variant, size, asText = false, asChild = false, ...props }, ref) => {
-    const Comp = asChild ? react_slot_1.Slot : "button";
-    // @ts-ignore
-    const classes = asText ? textVariants({ variant, className }) : buttonVariants({ variant, size, className });
-    return (React.createElement(Comp, { className: (0, utils_1.cn)(classes), ref: ref, ...props }));
-});
-exports.Button = Button;
-Button.displayName = "Button";
-//# sourceMappingURL=Button.js.map

package/dist/Base/Buttons/Button.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../src/Base/Buttons/Button.tsx"],"names":[],"mappings":";;;;AAAA,0DAA8B;AAC9B,qDAA2C;AAC3C,uEAAiE;AAEjE,6CAAsC;AACtC,uDAAuD;AAEvD,MAAM,cAAc,GAAG,IAAA,8BAAG,EACzB,sNAAsN,EACtN;IACC,QAAQ,EAAE;QACT,OAAO,EAAE;YACR,OAAO,EAAE,sOAAsO;YAC/O,SAAS,EAAE,wPAAwP;YACnQ,OAAO,EAAE,sOAAsO;YAC/O,iBAAiB,EAAE,+ZAA+Z;YAClb,OAAO,EAAE,sEAAsE;YAC/E,KAAK,EAAG,6HAA6H;YACrI,6DAA6D;SAC7D;QACD,IAAI,EAAE;YACL,EAAE,EAAI,6DAA6D;YACnE,EAAE,EAAI,6DAA6D;YACnE,EAAE,EAAI,2DAA2D;YACjE,EAAE,EAAI,2DAA2D;YACjE,GAAG,EAAG,yDAAyD;SAC/D;KACD;IACD,eAAe,EAAE;QAChB,OAAO,EAAE,SAAS;QAClB,IAAI,EAAE,IAAI;KACV;CACD,CACD,CAAA;AAuCgB,wCAAc;AAtC/B,MAAM,YAAY,GAAG,IAAA,8BAAG,EACvB,mJAAmJ,EACnJ;IACC,QAAQ,EAAE;QACT,OAAO,EAAE;YACR,OAAO,EAAE,wHAAwH;SACjI;KACD;IACD,eAAe,EAAE;QAChB,OAAO,EAAE,SAAS;KAClB;CACD,CACD,CAAA;AASD,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAC7B,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,EAAE,OAAO,GAAG,KAAK,EAAE,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE;IAC/E,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,iBAAI,CAAC,CAAC,CAAC,QAAQ,CAAA;IACzC,aAAa;IACb,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,YAAY,CAAM,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IAC/G,OAAO,CACL,oBAAC,IAAI,IACH,SAAS,EAAE,IAAA,UAAE,EAAC,OAAO,CAAC,EACtB,GAAG,EAAE,GAAG,KACJ,KAAK,GACT,CACH,CAAA;AACH,CAAC,CACF,CAAA;AAIQ,wBAAM;AAFf,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA"}