@sikka/hawa 0.1.25 → 0.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sikka/hawa",
-  "version": "0.1.25",
+  "version": "0.1.27",
   "description": "SaaS Oriented UI Kit",
   "main": "lib/index.js",
   "module": "es/index.es.js",
@@ -109,6 +109,7 @@
     "@radix-ui/react-dropdown-menu": "^2.0.5",
     "@radix-ui/react-label": "^2.0.2",
     "@radix-ui/react-popover": "^1.0.6",
+    "@radix-ui/react-tabs": "^1.0.4",
     "@radix-ui/react-tooltip": "^1.0.6",
     "class-variance-authority": "^0.7.0",
     "clsx": "^1.2.1",

package/src/blocks/Pricing/ComparingPlans.tsx

@@ -1,5 +1,5 @@
 import React, { useState, FC } from "react"
-import { HawaTabs } from "../../elements"
+import { HawaRadio } from "../../elements"
 import { Tooltip } from "../../elements/Tooltip"
 
 const CheckMark = () => (
@@ -65,29 +65,23 @@ type ComparingPlansTypes = {
   direction?: "rtl" | "ltr"
 }
 export const ComparingPlans: FC<ComparingPlansTypes> = (props) => {
-  const [currentCurrency, setCurrentCurrency] = useState("SAR")
+  const [currentCurrency, setCurrentCurrency] = useState("sar")
   const [currentCycle, setCurrentCycle] = useState("month")
 
   return (
     <div id="detailed-pricing" className="w-full overflow-x-auto">
       <div className="mb-2 flex w-full justify-between">
-        <HawaTabs
-          pill
+        <HawaRadio
+          design="tabs"
           defaultValue={currentCycle}
           options={props.billingCycles}
-          onChangeTab={(e: any) => {
-            // setCurrentCycle(e.label)
-            props.onCycleChange(e)
-          }}
+          onChangeTab={(e: any) => props.onCycleChange(e)}
         />
-        <HawaTabs
-          pill
+        <HawaRadio
+          design="tabs"
           defaultValue={currentCurrency}
           options={props.currencies}
-          onChangeTab={(e: any) => {
-            // setCurrentCurrency(e.label)
-            props.onCurrencyChange(e)
-          }}
+          onChangeTab={(e: any) => props.onCurrencyChange(e)}
         />
       </div>
       <div className=" overflow-hidden rounded">

package/src/blocks/Pricing/PricingPlans.tsx

@@ -1,5 +1,5 @@
 import React, { FC } from "react"
-import { HawaPricingCard, HawaTabs } from "../../elements"
+import { HawaPricingCard, HawaRadio } from "../../elements"
 
 type PricingPlansTypes = {
   plans: [
@@ -46,14 +46,14 @@ export const PricingPlans: FC<PricingPlansTypes> = (props) => {
   return (
     <div>
       <div className="mb-2 flex w-full justify-between">
-        <HawaTabs
-          pill
+        <HawaRadio
+          design="tabs"
           defaultValue={props.currentCycle}
           options={props.billingCycles}
           onChangeTab={(e: any) => props.onCycleChange(e)}
         />
-        <HawaTabs
-          pill
+        <HawaRadio
+          design="tabs"
           defaultValue={props.currentCurrency}
           options={props.currencies}
           onChangeTab={(e: any) => props.onCurrencyChange(e)}

package/src/elements/HawaTabs.tsx

@@ -1,5 +1,5 @@
 import React, { useState, FC } from "react"
-import clsx from "clsx"
+import { cn } from "../util"
 
 // TODO: fix wrapping issue when small screen
 
@@ -62,13 +62,14 @@ export const HawaTabs: FC<TabsTypes> = ({
   return (
     <div
       dir={direction}
-      className={clsx(
+      className={cn(
         containerStyle[orientation],
         props.options[selectedOption] ? "border-b-2" : "border-b-0"
       )}
     >
       <ul
-        className={clsx(
+        className={cn(
+          "w-full border-primary",
           marginBetween
             ? orientation === "vertical"
               ? "mb-0"
@@ -78,8 +79,9 @@ export const HawaTabs: FC<TabsTypes> = ({
             ? "ml-" + marginBetween
             : "mr-" + marginBetween,
           tabsStyle[orientation],
-          "border-primary",
-
+          orientation === "horizontal"
+            ? "grid grid-cols-3 gap-1 sm:flex  sm:flex-row sm:gap-0 "
+            : "",
           // orientation === "vertical"
           //   ? direction === "rtl"
           //     ? "rounded-none rounded-r border-l-2"
@@ -92,39 +94,37 @@ export const HawaTabs: FC<TabsTypes> = ({
             ? direction === "rtl"
               ? "rounded-none rounded-r border-l-2"
               : "rounded-none rounded-l border-r-2"
-            : "border-b-2"
+            : "border-b-0 sm:border-b-2"
         )}
       >
         {props.options?.map((opt: any, o) => (
-          <li key={o}>
-            <button
-              aria-current="page"
-              onClick={() => {
-                setSelectedOption(opt.value)
-                props?.onChangeTab(opt)
-              }}
-              className={clsx(
-                "flex flex-row items-center gap-2",
-                opt.value === selectedOption
-                  ? // props.options[selectedOption].value === opt.value
-                    [
-                      activeTabStyle[orientation],
-                      direction === "rtl" ? "rounded-r" : "rounded-l",
-                    ]
-                  : inactiveTabStyle[orientation],
-                "w-full  transition-all",
-                pill
-                  ? "rounded"
-                  : orientation === "vertical"
-                  ? "rounded rounded-bl-none rounded-tl-none"
-                  : "rounded rounded-bl-none rounded-br-none"
-                // direction === "rtl" ? "bg-yellow-400" : "bg-yellow-400"
-              )}
-            >
-              {opt.icon}
-              {opt.label}
-            </button>
-          </li>
+          <button
+            key={o}
+            aria-current="page"
+            onClick={() => {
+              setSelectedOption(opt.value)
+              props?.onChangeTab(opt)
+            }}
+            className={cn(
+              opt.value === selectedOption
+                ? // props.options[selectedOption].value === opt.value
+                  [
+                    activeTabStyle[orientation],
+                    direction === "rtl" ? "rounded-r" : "rounded-l",
+                  ]
+                : inactiveTabStyle[orientation],
+              pill
+                ? "rounded"
+                : orientation === "vertical"
+                ? "rounded rounded-bl-none rounded-tl-none"
+                : "rounded sm:rounded-b-none",
+              // direction === "rtl" ? "bg-yellow-400" : "bg-yellow-400"
+              "flex w-fit flex-row items-center gap-2  transition-all "
+            )}
+          >
+            {opt.icon}
+            {opt.label}
+          </button>
         ))}
       </ul>
 
@@ -132,7 +132,7 @@ export const HawaTabs: FC<TabsTypes> = ({
         {props.options.map((tab, i) => (
           <div
             key={i}
-            className={clsx(selectedOption === tab.value ? "" : "hidden")}
+            className={cn(selectedOption === tab.value ? "" : "hidden")}
           >
             {tab.content}
           </div>

package/src/elements/Tabs.tsx

@@ -0,0 +1,97 @@
+import * as React from "react"
+import * as TabsPrimitive from "@radix-ui/react-tabs"
+
+import { cn } from "../util"
+
+const TabsContext = React.createContext<{
+  orientation?: "vertical" | "horizontal"
+}>({
+  orientation: "vertical", // default value
+})
+
+// const Tabs = TabsPrimitive.Root
+type TabsRootProps = React.ComponentPropsWithoutRef<
+  typeof TabsPrimitive.Root
+> & {
+  orientation?: "vertical" | "horizontal"
+}
+
+const Tabs = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.Root>,
+  TabsRootProps
+>(({ className, orientation, ...props }, ref) => (
+  <TabsPrimitive.Root
+    ref={ref}
+    className={cn(
+      className,
+      "flex gap-2",
+      orientation === "horizontal" ? "flex-row" : "flex-col"
+    )}
+    {...props}
+  >
+    <TabsContext.Provider value={{ orientation }}>
+      {props.children}
+    </TabsContext.Provider>
+  </TabsPrimitive.Root>
+))
+Tabs.displayName = TabsPrimitive.Root.displayName
+
+// type TabsListProps = React.ComponentPropsWithoutRef<
+//   typeof TabsPrimitive.List
+// > & {
+//   //   orientation?: "vertical" | "horizontal"
+// }
+
+const TabsList = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.List>,
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
+>(({ className, ...props }, ref) => {
+  const { orientation } = React.useContext(TabsContext)
+
+  return (
+    <TabsPrimitive.List
+      ref={ref}
+      className={cn(
+        "flex w-fit flex-wrap items-center justify-start gap-1  rounded bg-muted p-1  text-muted-foreground ",
+        orientation === "horizontal" ? "flex-col" : "flex-row",
+        className
+      )}
+      {...props}
+    />
+  )
+})
+TabsList.displayName = TabsPrimitive.List.displayName
+
+const TabsTrigger = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.Trigger>,
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
+>(({ className, ...props }, ref) => {
+  return (
+    <TabsPrimitive.Trigger
+      ref={ref}
+      className={cn(
+        "inline-flex w-full flex-1 select-none items-center justify-center whitespace-nowrap rounded border px-3 py-1.5 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-primary data-[state=active]:text-primary-foreground data-[state=active]:shadow-sm ",
+        className
+      )}
+      {...props}
+    />
+  )
+})
+TabsTrigger.displayName = TabsPrimitive.Trigger.displayName
+
+const TabsContent = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
+>(({ className, ...props }, ref) => (
+  <TabsPrimitive.Content
+    ref={ref}
+    className={cn(
+      "w-full ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+      className
+    )}
+    {...props}
+  />
+))
+TabsContent.displayName = TabsPrimitive.Content.displayName
+
+export { Tabs, TabsList, TabsTrigger, TabsContent }

package/src/elements/index.ts

@@ -64,3 +64,4 @@ export * from "./Skeleton"
 export * from "./InterfaceSettings"
 export * from "./DropdownMenu"
 export * from "./Popover"
+export * from "./Tabs"

package/src/layout/Sidebar.tsx

@@ -156,7 +156,7 @@ const SidebarItem: React.FC<{
   const getSelectedStyle = (value: string, index: number) => {
     return isSelected && isSelected[index] === value
       ? "bg-primary text-primary-foreground  cursor-default"
-      : "hover:bg-primary/30"
+      : "hover:bg-primary/10"
   }
   if (item.subitems) {
     return (

package/src/styles.css

@@ -1464,6 +1464,9 @@ video {
 .grid-cols-2 {
   grid-template-columns: repeat(2, minmax(0, 1fr));
 }
+.grid-cols-3 {
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+}
 .grid-cols-4 {
   grid-template-columns: repeat(4, minmax(0, 1fr));
 }
@@ -2990,9 +2993,6 @@ body {
 .hover\:bg-primary\/20:hover {
   background-color: hsl(var(--primary) / 0.2);
 }
-.hover\:bg-primary\/30:hover {
-  background-color: hsl(var(--primary) / 0.3);
-}
 .hover\:bg-primary\/40:hover {
   background-color: hsl(var(--primary) / 0.4);
 }
@@ -3315,6 +3315,9 @@ body {
   --tw-bg-opacity: 1;
   background-color: hsl(252 56.0% 57.5% / var(--tw-bg-opacity));
 }
+.data-\[state\=active\]\:bg-primary[data-state=active] {
+  background-color: hsl(var(--primary));
+}
 .data-\[state\=open\]\:bg-accent[data-state=open] {
   background-color: hsl(var(--accent));
 }
@@ -3334,6 +3337,9 @@ body {
   --tw-text-opacity: 1;
   color: hsl(255 65.0% 99.4% / var(--tw-text-opacity));
 }
+.data-\[state\=active\]\:text-primary-foreground[data-state=active] {
+  color: hsl(var(--primary-foreground));
+}
 .data-\[state\=open\]\:text-violet-11[data-state=open] {
   --tw-text-opacity: 1;
   color: hsl(250 43.0% 48.0% / var(--tw-text-opacity));
@@ -3341,6 +3347,11 @@ body {
 .data-\[disabled\]\:opacity-50[data-disabled] {
   opacity: 0.5;
 }
+.data-\[state\=active\]\:shadow-sm[data-state=active] {
+  --tw-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+  --tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color);
+  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+}
 .data-\[state\=open\]\:animate-in[data-state=open] {
   animation-name: enter;
   animation-duration: 150ms;
@@ -3683,15 +3694,36 @@ body {
 }
 @media (min-width: 640px) {
 
+  .sm\:flex {
+    display: flex;
+  }
+
   .sm\:columns-2 {
     -moz-columns: 2;
          columns: 2;
   }
 
+  .sm\:flex-row {
+    flex-direction: row;
+  }
+
+  .sm\:gap-0 {
+    gap: 0px;
+  }
+
   .sm\:gap-8 {
     gap: 2rem;
   }
 
+  .sm\:rounded-b-none {
+    border-bottom-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  .sm\:border-b-2 {
+    border-bottom-width: 2px;
+  }
+
   .sm\:p-20 {
     padding: 5rem;
   }