fix: conflicts

Author: jrgarciadev

.changeset/clean-seahorses-cheat.md

@@ -0,0 +1,5 @@
+---
+"@heroui/autocomplete": patch
+---
+
+ensure focused item matches selected item after filter, selection (#5277)

.changeset/fast-ways-hang.md

@@ -0,0 +1,6 @@
+---
+"@heroui/shared-icons": patch
+"@heroui/toast": patch
+---
+
+support render icons by function in Toast

.changeset/giant-sloths-shop.md

@@ -0,0 +1,5 @@
+---
+"@heroui/date-picker": patch
+---
+
+fix date-range-picker error state (#5309)

.changeset/honest-hats-explode.md

@@ -0,0 +1,6 @@
+---
+"@heroui/autocomplete": patch
+"@heroui/select": patch
+---
+
+persist last selected item position (#5282)

.changeset/kind-dolphins-listen.md

@@ -0,0 +1,5 @@
+---
+"@heroui/theme": patch
+---
+
+Fixed the clear button rendering for smaller devices (#5069)

.changeset/stale-chairs-tan.md

@@ -0,0 +1,22 @@
+---
+"@heroui/autocomplete": patch
+"@heroui/dom-animation": patch
+"@heroui/date-picker": patch
+"@heroui/framer-utils": patch
+"@heroui/accordion": patch
+"@heroui/calendar": patch
+"@heroui/dropdown": patch
+"@heroui/popover": patch
+"@heroui/snippet": patch
+"@heroui/tooltip": patch
+"@heroui/button": patch
+"@heroui/navbar": patch
+"@heroui/ripple": patch
+"@heroui/select": patch
+"@heroui/modal": patch
+"@heroui/card": patch
+"@heroui/tabs": patch
+"@heroui/system": patch
+---
+
+bump framer-motion version

.eslintignore

@@ -16,7 +16,7 @@ module.exports = {
   "**/*.{js,ts,jsx,tsx}": async (files) => {
     const filesToLint = await removeIgnoredFiles(files);
 
-    return [`eslint -c .eslintrc.json --max-warnings=0 --fix ${filesToLint}`];
+    return [`eslint --max-warnings=0 --fix ${filesToLint}`];
   },
   "**/*.css": async (files) => {
     const filesToLint = await removeIgnoredFiles(files);

.eslintrc.json

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 "use client";
 
 import * as React from "react";

.lintstagedrc.cjs

@@ -1,4 +1,3 @@
-/* eslint-disable jsx-a11y/no-onchange */
 "use client";
 
 import {

apps/docs/app/examples/autocomplete/async-filtering/page.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable jsx-a11y/no-onchange */
 "use client";
 
 import {

apps/docs/app/examples/table/custom-styles/page.tsx

@@ -91,7 +91,7 @@ export const CarbonAd: React.FC<unknown> = () => {
               setShowEthicalAds(true);
             }
           });
-        } catch (error) {
+        } catch {
           loadCarbonAds();
         }
       } else {

apps/docs/app/examples/table/use-case/page.tsx

@@ -47,7 +47,6 @@ export default {
 
     if (!document.hidden) {
       if (typeof _carbonads !== "undefined" && isElementInViewport("#carbonads")) {
-        // eslint-disable-next-line no-undef
         _carbonads.refresh();
       }
     }

apps/docs/components/ads/carbon-ad/carbon-ad.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable jsx-a11y/media-has-caption */
 "use client";
 
 import {useInView} from "framer-motion";

apps/docs/components/ads/carbon-ad/carbon-optimize.js

@@ -210,7 +210,7 @@ export const Cmdk: FC<{}> = () => {
     [query],
   );
 
-  const items = !isEmpty(results) ? results : recentSearches ?? [];
+  const items = !isEmpty(results) ? results : (recentSearches ?? []);
 
   // Toggle the menu when ⌘K / CTRL K is pressed
   useEffect(() => {

apps/docs/components/blog/video-in-view.tsx

@@ -19,14 +19,14 @@ const DynamicReactLiveDemo = dynamic(
   () => import("./react-live-demo").then((m) => m.ReactLiveDemo),
   {
     ssr: false,
-    // eslint-disable-next-line react/display-name
+
     loading: () => <Skeleton className="w-full h-24 rounded-xl" />,
   },
 );
 
 const DynamicSandpack = dynamic(() => import("../../../sandpack").then((m) => m.Sandpack), {
   ssr: false,
-  // eslint-disable-next-line react/display-name
+
   loading: () => <Skeleton className="w-full h-32 rounded-xl" />,
 });
 

apps/docs/components/cmdk.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-/* eslint-disable react/display-name */
 import {
   Button,
   Image,

apps/docs/components/docs/components/code-demo/code-demo.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-/* eslint-disable react/display-name */
 import {useMemo, useState} from "react";
 import {Tabs, Tab, Card, CardBody, Image, Button, RadioGroup, Radio} from "@heroui/react";
 import NextLink from "next/link";

apps/docs/components/marketing/a11y-otb.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-/* eslint-disable react/display-name */
 import {Button, Link} from "@heroui/react";
 import NextLink from "next/link";
 

apps/docs/components/marketing/custom-themes/custom-themes.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-/* eslint-disable react/display-name */
 import {Code, Button, Tooltip} from "@heroui/react";
 import {useState} from "react";
 import NextLink from "next/link";

apps/docs/components/marketing/customization.tsx

@@ -1,5 +1,3 @@
-/* eslint-disable react/display-name */
-
 import {title, subtitle, titleWrapper, sectionWrapper} from "@/components/primitives";
 import {FeaturesGrid} from "@/components/marketing/features-grid";
 import landingContent from "@/content/landing";

apps/docs/components/marketing/dark-mode.tsx

@@ -9,7 +9,7 @@ async function getData() {
     return {
       sponsors,
     };
-  } catch (error) {
+  } catch {
     throw new Error("Failed to fetch data");
   }
 }

apps/docs/components/marketing/last-but-not-least.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/display-name */
 import {clsx} from "@heroui/shared-utils";
 import * as Components from "@heroui/react";
 import {Language} from "prism-react-renderer";

apps/docs/components/marketing/support.tsx

@@ -77,7 +77,7 @@ export const useSandpack = ({
   }, {});
 
   let dependencies = {
-    "framer-motion": "11.9.0",
+    "framer-motion": "11.18.2",
     "@heroui/react": "latest",
   };
 
@@ -150,7 +150,7 @@ export const useSandpack = ({
 
   // const dependencies = useMemo(() => {
   //   let deps = {
-  //     "framer-motion": "11.9.0",
+  //     "framer-motion": "11.18.2",
   //   };
 
   //   if (hasComponents) {

apps/docs/components/mdx-components.tsx

@@ -375,6 +375,12 @@ You can customize the `Listbox` items style by using the `itemClasses` prop and
       description: "Whether to disable the animation of the listbox items.",
       default: "false"
     },
+    {
+      attribute: "selectionBehavior",
+      type: "'toggle' | 'replace'",
+      description: "How multiple selection should behave in the collection.",
+      default: "toggle"
+    },
     {
       attribute: "classNames",
       type: "Partial<Record<\"base\" | \"list\" | \"emptyContent\", string>>",
@@ -397,7 +403,7 @@ You can customize the `Listbox` items style by using the `itemClasses` prop and
     {
       attribute: "onAction",
       type: "(key: React.Key) => void",
-      description: "Handler that is called when an item is selected.",
+      description: "Handler that is called when a user performs an action on an item. The exact user event depends on the collection's selectionBehavior prop and the interaction modality.",
       default: "-"
     },
     {

apps/docs/components/sandpack/use-sandpack.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 import * as React from "react";
 
 export function useScrollPosition(ref: React.MutableRefObject<HTMLElement | null>) {

apps/docs/content/docs/components/listbox.mdx

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
 import * as React from "react";
 
 export function useScrollSpy(selectors: string[], options?: IntersectionObserverInit) {

apps/docs/hooks/use-scroll-position.ts

@@ -16,7 +16,6 @@ export const useUpdateEffect: typeof useEffect = (effect, deps) => {
       return effect();
     }
     effectCycleRef.current = true;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, deps);
 
   useEffect(() => {

apps/docs/hooks/use-scroll-spy.ts

@@ -7,7 +7,7 @@ export interface GithubError extends Error {
 function getErrorText(res: Response) {
   try {
     return res.text();
-  } catch (err) {
+  } catch {
     return res.statusText;
   }
 }

apps/docs/hooks/use-update-effect.ts

@@ -20,7 +20,6 @@ const lineNumberify = function lineNumberify(ast, lineNum = 1) {
         const lines = node.value.split("\n");
 
         for (let i = 0; i < lines.length; i++) {
-          // eslint-disable-next-line no-plusplus
           if (i !== 0) ++lineNumber;
           if (i === lines.length - 1 && lines[i].length === 0) continue;
           result.nodes.push({

apps/docs/libs/github/utils.ts

@@ -62,7 +62,7 @@
     "color2k": "2.0.3",
     "contentlayer2": "0.5.3",
     "date-fns": "4.1.0",
-    "framer-motion": "11.11.13",
+    "framer-motion": "11.18.2",
     "geist": "1.3.1",
     "github-slugger": "^2.0.0",
     "gray-matter": "^4.0.3",

apps/docs/libs/rehype-highlight-line.js

@@ -48,7 +48,7 @@ async function build() {
   // make sure the sponsors directory exists
   try {
     await fs.access(sponsorsDir);
-  } catch (error) {
+  } catch {
     await fs.mkdir(sponsorsDir, { recursive: true });
   }
   await Promise.all([buildSponsors()])

apps/docs/package.json

@@ -35,7 +35,7 @@ async function getGithubInfo() {
     };
 
     // Format JSON with prettier
-    const formattedJson = prettier.format(JSON.stringify(githubInfo), {
+    const formattedJson = await prettier.format(JSON.stringify(githubInfo), {
       parser: 'json',
       printWidth: 80,
       tabWidth: 2,