fix #259 partially converting some of the components from headlessui to shadcn #531
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,9 @@ | ||
| import Head from "next/head"; | ||
| import Link from "next/link"; | ||
| import { notFound } from "next/navigation"; | ||
| import { Button } from "@/components/ui/button"; | ||
|
|
||
| import { getInvestor } from "@/lib/content/investor"; | ||
|
|
||
| export default async function InvestorPage({ | ||
| params, | ||
|
|
@@ -274,7 +254,7 @@ export default async function InvestorPage({ | |
| x={86} | ||
| /> | ||
| </svg> | ||
| <blockquote className="text-balance text-xl font-medium leading-8 text-gray-800 sm:text-2xl sm:leading-9"> | ||
| <p> | ||
| Papermark solved a big pain point for me. DocSend | ||
| monopoly will end soon! | ||
|
|
||
|
There was a problem hiding this comment. No need to change the accordion behaviour. Let's leave the chevron. This component is used in other places and relies on the chevron. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import * as React from "react"; | ||
|
|
||
| import * as AccordionPrimitive from "@radix-ui/react-accordion"; | ||
| import { Minus as MinusSmallIcon ,Plus as PlusSmallIcon } from "lucide-react"; | ||
|
|
||
| import { cn } from "@/lib/utils"; | ||
|
|
||
|
|
@@ -27,13 +27,14 @@ const AccordionTrigger = React.forwardRef< | |
| <AccordionPrimitive.Trigger | ||
| ref={ref} | ||
| className={cn( | ||
| "flex flex-1 items-center justify-between py-4 font-medium transition-all hover:underline group", | ||
| className, | ||
| )} | ||
| {...props} | ||
| > | ||
| {children} | ||
| <PlusSmallIcon className="h-6 w-6 shrink-0 transition-transform duration-200 group-data-[state=open]:hidden" /> | ||
| <MinusSmallIcon className="h-6 w-6 shrink-0 transition-transform duration-200 group-data-[state=closed]:hidden" /> | ||
| </AccordionPrimitive.Trigger> | ||
| </AccordionPrimitive.Header> | ||
| )); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,11 +1,13 @@ | ||||||
| import { CheckIcon} from "lucide-react"; | ||||||
| import { Dispatch, SetStateAction, useState } from "react"; | ||||||
| import * as React from "react" | ||||||
| import { | ||||||
| Select, | ||||||
| SelectContent, | ||||||
| SelectTrigger, | ||||||
| SelectValue, | ||||||
| } from "@/components/ui/select" | ||||||
| import { cn } from "@/lib/utils"; | ||||||
|
|
||||||
| interface DropDownProps { | ||||||
| options: string[]; | ||||||
|
|
@@ -18,58 +20,48 @@ export default function DropDown({ | |||||
| option, | ||||||
| setOption, | ||||||
| }: DropDownProps) { | ||||||
| const [menuOpen, setMenuOpen] = useState<boolean>(false); | ||||||
| const [isFirstClick, setIsFirstClick] = useState<boolean>(false); | ||||||
|
|
||||||
| const handleMenuStateChange = (open: boolean) => { | ||||||
| if (isFirstClick) { | ||||||
| setMenuOpen(true); // Keep the dropdown open on the first click | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| // If the menu is closed, reset the isFirstClick state | ||||||
| if (!open) { | ||||||
| setIsFirstClick(false); | ||||||
| setMenuOpen(false); // Ensure the dropdown is closed | ||||||
| } else { | ||||||
| setMenuOpen(true); // Open the dropdown | ||||||
| } | ||||||
| }; | ||||||
|
|
||||||
| return ( | ||||||
| <Select open={menuOpen} onOpenChange={handleMenuStateChange}> | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| <SelectTrigger className="inline-flex w-full justify-between items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-gray-400 font-light shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-blue text-base"> | ||||||
| <SelectValue placeholder={option}/> | ||||||
| </SelectTrigger> | ||||||
| <SelectContent> | ||||||
| {options.map((optionItem) => ( | ||||||
| <button | ||||||
| onClick={() => { | ||||||
| setOption(optionItem) | ||||||
| setMenuOpen(false) | ||||||
| }} | ||||||
| className={cn( | ||||||
| option === optionItem ? "bg-gray-200" : "hover:bg-gray-100", | ||||||
| "px-4 py-2 text-sm w-full text-left flex items-center space-x-2 justify-between", | ||||||
| )} | ||||||
| > | ||||||
| <span>{optionItem}</span> | ||||||
| {option === optionItem ? ( | ||||||
| <CheckIcon className="w-4 h-4 text-bold" /> | ||||||
| ) : null} | ||||||
| </button> | ||||||
| ))} | ||||||
| </SelectContent> | ||||||
| </Select> | ||||||
| ) | ||||||
| } | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| "use client"; | ||
| import { | ||
| Accordion, | ||
| AccordionContent, | ||
| AccordionItem, | ||
| AccordionTrigger, | ||
| } from "@/components/ui/accordion" | ||
| const faqs = [ | ||
| { | ||
| question: "What is Papermark?", | ||
|
|
@@ -44,38 +46,20 @@ const faqs = [ | |
| export default function Faq() { | ||
| return ( | ||
| <div className=""> | ||
| <dl className="mt-10 divide-y divide-gray-800/10"> | ||
| {faqs.map((faq) => ( | ||
| <Accordion key={faq.question} type="single" collapsible> | ||
| <AccordionItem value={faq.question} className="py-2 border-none"> | ||
| <AccordionTrigger className="text-left text-gray-800 dark:text-gray-200 text-balance font-medium leading-7 hover:no-underline"> | ||
| {faq.question} | ||
| </AccordionTrigger> | ||
| <AccordionContent className="text-base leading-7 text-gray-500"> | ||
| {faq.answer} | ||
| </AccordionContent> | ||
| </AccordionItem> | ||
| </Accordion> | ||
| ))} | ||
| </dl> | ||
| </div> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,6 @@ | |
| "@aws-sdk/s3-request-presigner": "^3.614.0", | ||
| "@chronark/zod-bird": "^0.3.9", | ||
| "@github/webauthn-json": "^2.1.1", | ||
| "@jitsu/js": "^1.9.5", | ||
| "@mdx-js/loader": "^3.0.1", | ||
| "@mdx-js/react": "^3.0.1", | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be a
selectcomponent from shadcn not a popover.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay will make the changes