Skip to content

Commit

Permalink
Merge branch 'canary' into bugfix-selection-type
Browse files Browse the repository at this point in the history
  • Loading branch information
wingkwong committed Jul 6, 2024
2 parents 8f263da + 8dce94e commit 92f8703
Show file tree
Hide file tree
Showing 69 changed files with 777 additions and 294 deletions.
5 changes: 5 additions & 0 deletions .changeset/beige-ears-laugh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/theme": patch
---

Differentiate selected bg color from striped bg color (#1602)
5 changes: 5 additions & 0 deletions .changeset/chatty-pianos-run.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/date-input": patch
---

Removed autoCapitalize to prevent warnings (#3297)
5 changes: 5 additions & 0 deletions .changeset/curvy-students-judge.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/select": patch
---

fixed select closing issue with selector button (#3276)
5 changes: 5 additions & 0 deletions .changeset/friendly-pumas-brush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/calendar": patch
---

disable button picker in calendar if `isDisabled` is true (#3357)
5 changes: 5 additions & 0 deletions .changeset/funny-fishes-try.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/accordion": patch
---

Fixed cursor navigation within text (#2152, #3364)
5 changes: 5 additions & 0 deletions .changeset/happy-cameras-whisper.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/use-scroll-position": patch
---

clearing throttleTimeout when it is supposed to be null in useScrollPosition (#3139)
5 changes: 5 additions & 0 deletions .changeset/lucky-tomatoes-tap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/select": patch
---

Fixed import HiddenSelect and UseSelectProps (#3356)
5 changes: 5 additions & 0 deletions .changeset/many-wasps-move.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/accordion": patch
---

Pass missing `dividerProps` to Divider (#3390)
6 changes: 6 additions & 0 deletions .changeset/plenty-suns-juggle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nextui-org/autocomplete": patch
"@nextui-org/popover": patch
---

add `disableDialogFocus` to free-solo-popover (#3225, #3124, #3203)
8 changes: 8 additions & 0 deletions .changeset/purple-singers-knock.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@nextui-org/calendar": patch
"@nextui-org/date-input": patch
"@nextui-org/system": patch
"@nextui-org/shared-utils": patch
---

Fixed incorrect year in `showMonthAndYearPickers` with different locales
5 changes: 5 additions & 0 deletions .changeset/real-falcons-care.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/user": patch
---

removed `name` from `avatarProps` in `use-user.ts` (#3369)
5 changes: 5 additions & 0 deletions .changeset/stale-planes-flash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/image": patch
---

override default auto height (#3325)
5 changes: 5 additions & 0 deletions .changeset/sweet-flowers-dress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/popover": patch
---

close popover on scroll (#3265)
6 changes: 6 additions & 0 deletions .changeset/sweet-parents-chew.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@nextui-org/date-input": patch
"@nextui-org/date-picker": patch
---

Fixed date picker closing issue after pressing selector button (#3282)
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
"prev": ["const", "let", "var"],
"next": ["const", "let", "var"]
}
]
],
"import/consistent-type-specifier-style": ["error", "prefer-top-level"]
}
}
4 changes: 4 additions & 0 deletions apps/docs/app/blog/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import {Image} from "@nextui-org/react";

import {ScriptProviders} from "@/components/scripts/script-providers";

interface DocsLayoutProps {
children: React.ReactNode;
}
Expand All @@ -22,6 +24,8 @@ export default function DocsLayout({children}: DocsLayoutProps) {
>
<Image removeWrapper alt="docs right background" src="/gradients/docs-right.png" />
</div>

<ScriptProviders />
</>
);
}
3 changes: 3 additions & 0 deletions apps/docs/app/docs/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {Image} from "@nextui-org/react";

import manifest from "@/config/routes.json";
import {DocsSidebar} from "@/components/docs/sidebar";
import {ScriptProviders} from "@/components/scripts/script-providers";

interface DocsLayoutProps {
children: React.ReactNode;
Expand Down Expand Up @@ -30,6 +31,8 @@ export default function DocsLayout({children}: DocsLayoutProps) {
>
<Image removeWrapper alt="docs right background" src="/gradients/docs-right.png" />
</div>

<ScriptProviders />
</>
);
}
3 changes: 3 additions & 0 deletions apps/docs/app/figma/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {Image} from "@nextui-org/react";

import {Blockquote} from "@/components/docs/components/blockquote";
import {FigmaButton} from "@/components/figma-button";
import {ScriptProviders} from "@/components/scripts/script-providers";

export default function FigmaPage() {
return (
Expand Down Expand Up @@ -43,6 +44,8 @@ export default function FigmaPage() {
>
<Image removeWrapper alt="docs right background" src="/gradients/docs-right.png" />
</div>

<ScriptProviders />
</>
);
}
2 changes: 0 additions & 2 deletions apps/docs/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {fontSans} from "@/config/fonts";
import {Navbar} from "@/components/navbar";
import {Footer} from "@/components/footer";
import {ProBanner} from "@/components/pro-banner";
import {ScriptProviders} from "@/components/scripts/script-providers";

export const metadata: Metadata = {
title: {
Expand Down Expand Up @@ -77,7 +76,6 @@ export default function RootLayout({children}: {children: React.ReactNode}) {
</div>
<Cmdk />
</Providers>
<ScriptProviders />
</body>
</html>
);
Expand Down
4 changes: 0 additions & 4 deletions apps/docs/components/footer.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
"use client";

import dynamic from "next/dynamic";
import {usePathname} from "next/navigation";

import {getCurrentYear} from "@/utils/time";

const VercelCallout = dynamic(() => import("./vercel-callout").then((mod) => mod.VercelCallout));

export const Footer = () => {
const pathname = usePathname();

Expand All @@ -18,7 +15,6 @@ export const Footer = () => {
<footer className="container mx-auto max-w-7xl pb-12 px-12">
<div className="flex flex-col justify-center items-center gap-1">
<p className="text-sm text-default-400">© {getCurrentYear()} NextUI Inc.</p>
<VercelCallout />
</div>
</footer>
);
Expand Down
18 changes: 0 additions & 18 deletions apps/docs/components/icons/social.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,6 @@ const NextJsIcon: React.FC<IconSvgProps> = ({size = 24, width, height, ...props}
</svg>
);
};
const VercelIcon: React.FC<IconSvgProps> = ({width, height = 44, ...props}) => {
return (
<svg
fill="none"
height={height}
viewBox="0 0 4438 1000"
width={width}
xmlns="http://www.w3.org/2000/svg"
{...props}
>
<path
d="M2223.75 250C2051.25 250 1926.87 362.5 1926.87 531.25C1926.87 700 2066.72 812.5 2239.38 812.5C2343.59 812.5 2435.47 771.25 2492.34 701.719L2372.81 632.656C2341.25 667.188 2293.28 687.344 2239.38 687.344C2164.53 687.344 2100.94 648.281 2077.34 585.781H2515.16C2518.59 568.281 2520.63 550.156 2520.63 531.094C2520.63 362.5 2396.41 250 2223.75 250ZM2076.09 476.562C2095.62 414.219 2149.06 375 2223.75 375C2298.59 375 2352.03 414.219 2371.41 476.562H2076.09ZM2040.78 78.125L1607.81 828.125L1174.69 78.125H1337.03L1607.66 546.875L1878.28 78.125H2040.78ZM577.344 0L1154.69 1000H0L577.344 0ZM3148.75 531.25C3148.75 625 3210 687.5 3305 687.5C3369.38 687.5 3417.66 658.281 3442.5 610.625L3562.5 679.844C3512.81 762.656 3419.69 812.5 3305 812.5C3132.34 812.5 3008.13 700 3008.13 531.25C3008.13 362.5 3132.5 250 3305 250C3419.69 250 3512.66 299.844 3562.5 382.656L3442.5 451.875C3417.66 404.219 3369.38 375 3305 375C3210.16 375 3148.75 437.5 3148.75 531.25ZM4437.5 78.125V796.875H4296.88V78.125H4437.5ZM3906.25 250C3733.75 250 3609.38 362.5 3609.38 531.25C3609.38 700 3749.38 812.5 3921.88 812.5C4026.09 812.5 4117.97 771.25 4174.84 701.719L4055.31 632.656C4023.75 667.188 3975.78 687.344 3921.88 687.344C3847.03 687.344 3783.44 648.281 3759.84 585.781H4197.66C4201.09 568.281 4203.12 550.156 4203.12 531.094C4203.12 362.5 4078.91 250 3906.25 250ZM3758.59 476.562C3778.13 414.219 3831.41 375 3906.25 375C3981.09 375 4034.53 414.219 4053.91 476.562H3758.59ZM2961.25 265.625V417.031C2945.63 412.5 2929.06 409.375 2911.25 409.375C2820.47 409.375 2755 471.875 2755 565.625V796.875H2614.38V265.625H2755V409.375C2755 330 2847.34 265.625 2961.25 265.625Z"
fill="currentColor"
/>
</svg>
);
};

const NpmIcon: React.FC<IconSvgProps> = ({width = "1em", height = "1em", ...props}) => {
return (
Expand Down Expand Up @@ -477,7 +460,6 @@ export {
OpenCollectiveIcon,
PatreonIcon,
NextJsIcon,
VercelIcon,
NpmIcon,
NpmSmallIcon,
PnpmIcon,
Expand Down
1 change: 0 additions & 1 deletion apps/docs/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ export * from "./theme-switch";
export * from "./looper-bg";
export * from "./code-window";
export * from "./gradient-box";
export * from "./vercel-callout";
export * from "./copy-button";
export * from "./demo-code-modal";
export * from "./mdx-components";
Expand Down
6 changes: 0 additions & 6 deletions apps/docs/components/marketing/sponsors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,10 @@ import {Button, Link} from "@nextui-org/react";
import {sectionWrapper} from "@/components/primitives";
import {Story2DesignLogo, ReplexicaLogo, CodeRabbitLogo} from "@/components/icons/sponsors";
import {HeartFilledIcon} from "@/components/icons";
import {VercelIcon} from "@/components/icons/social";
import {siteConfig} from "@/config/site";
import {Sponsor, SponsorItem} from "@/components/marketing/sponsor-item";

const sponsors: Sponsor[] = [
{
name: "Vercel",
href: "https://www.vercel.com?utm_source=nextui&utm_marketing=oss",
logo: <VercelIcon className="text-black dark:text-white" height={24} />,
},
{
name: "story.to.design",
href: "https://story.to.design?utm_source=nextui&utm_marketing=partnership",
Expand Down
27 changes: 0 additions & 27 deletions apps/docs/components/vercel-callout.tsx

This file was deleted.

Loading

0 comments on commit 92f8703

Please sign in to comment.