Skip to content

Commit

Permalink
Merge branch 'main' of github.com:heroui-inc/heroui into canary
Browse files Browse the repository at this point in the history
  • Loading branch information
jrgarciadev committed Jan 30, 2025
2 parents 7804de0 + ceb6385 commit be15943
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 46 deletions.
2 changes: 1 addition & 1 deletion apps/docs/app/blog/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function DocsLayout({children}: DocsLayoutProps) {
/>
</div>

<ScriptProviders isKapaEnabled={false} />
<ScriptProviders />
</>
);
}
2 changes: 1 addition & 1 deletion apps/docs/app/docs/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function DocsLayout({children}: DocsLayoutProps) {
/>
</div>

<ScriptProviders isKapaEnabled={false} />
<ScriptProviders />
</>
);
}
8 changes: 4 additions & 4 deletions apps/docs/components/marketing/heroui-pro-section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ export const HeroUIProSection = () => {

if (isDarkMode) {
imgSrc = isMobile
? "/images/nextuipro[email protected]"
: "/images/nextuipro-section-background.webp";
? "/images/herouipro[email protected]"
: "/images/herouipro-section-background.webp";
} else {
imgSrc = isMobile
? "/images/nextuipro[email protected]"
: "/images/nextuipro-section-background-light.webp";
? "/images/herouipro[email protected]"
: "/images/herouipro-section-background-light.webp";
}

const mobileClassName: string = isDarkMode
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/components/scripts/script-providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from "react";
import Script from "next/script";


export function ScriptProviders({isKapaEnabled}: {isKapaEnabled?: boolean}) {
export function ScriptProviders({isKapaEnabled = true}: {isKapaEnabled?: boolean}) {
if (!isKapaEnabled) return null;

return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
import {useCheckbox, CheckboxGroup, Chip, VisuallyHidden, tv} from "@heroui/react";

const checkbox = tv({
slots: {
base: "border-default hover:bg-default-200",
content: "text-default-500",
},
variants: {
isSelected: {
true: {
base: "border-primary bg-primary hover:bg-primary-500 hover:border-primary-500",
content: "text-primary-foreground pl-1",
},
export const CustomCheckbox = (props) => {
const checkbox = tv({
slots: {
base: "border-default hover:bg-default-200",
content: "text-default-500",
},
isFocusVisible: {
true: {
base: "outline-none ring-2 ring-focus ring-offset-2 ring-offset-background",
variants: {
isSelected: {
true: {
base: "border-primary bg-primary hover:bg-primary-500 hover:border-primary-500",
content: "text-primary-foreground pl-1",
},
},
isFocusVisible: {
true: {
base: "outline-none ring-2 ring-focus ring-offset-2 ring-offset-background",
},
},
},
},
});
});

export const CustomCheckbox = (props) => {
const {children, isSelected, isFocusVisible, getBaseProps, getLabelProps, getInputProps} =
useCheckbox({
...props,
Expand Down
40 changes: 20 additions & 20 deletions apps/docs/content/components/checkbox/custom-implementation.raw.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,32 +20,32 @@ export const CheckIcon = (props) => {
);
};

const checkbox = tv({
slots: {
base: "border-default hover:bg-default-200",
content: "text-default-500",
},
variants: {
isSelected: {
true: {
base: "border-primary bg-primary hover:bg-primary-500 hover:border-primary-500",
content: "text-primary-foreground pl-1",
},
},
isFocusVisible: {
true: {
base: "outline-none ring-2 ring-focus ring-offset-2 ring-offset-background",
},
},
},
});

export default function App() {
const {children, isSelected, isFocusVisible, getBaseProps, getLabelProps, getInputProps} =
useCheckbox({
defaultSelected: true,
});

const checkbox = tv({
slots: {
base: "border-default hover:bg-default-200",
content: "text-default-500",
},
variants: {
isSelected: {
true: {
base: "border-primary bg-primary hover:bg-primary-500 hover:border-primary-500",
content: "text-primary-foreground pl-1",
},
},
isFocusVisible: {
true: {
base: "outline-none ring-2 ring-focus ring-offset-2 ring-offset-background",
},
},
},
});

const styles = checkbox({isSelected, isFocusVisible});

return (
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/content/components/drawer/custom-styles.raw.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export default function App() {
alt="Event image"
className="aspect-square w-full hover:scale-110"
height={300}
src="https://herouipro.nyc3.cdn.digitaloceanspaces.com/components-images/places/san-francisco.png"
src="https://nextuipro.nyc3.cdn.digitaloceanspaces.com/components-images/places/san-francisco.png"
/>
</div>
<div className="flex flex-col gap-2 py-4">
Expand Down
2 changes: 1 addition & 1 deletion packages/components/drawer/stories/drawer.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ const CustomStylesTemplate = (args: DrawerProps) => {
alt="Event image"
className="aspect-square w-full hover:scale-110"
height={300}
src="https://herouipro.nyc3.cdn.digitaloceanspaces.com/components-images/places/san-francisco.png"
src="https://nextuipro.nyc3.cdn.digitaloceanspaces.com/components-images/places/san-francisco.png"
/>
</div>
<div className="flex flex-col gap-2 py-4">
Expand Down

0 comments on commit be15943

Please sign in to comment.