lightnet 3.10.5 → 3.10.7

package/src/admin/pages/media/fields/Collections.tsx

@@ -1,17 +1,18 @@
 import { type Control } from "react-hook-form"
 
-import ErrorMessage from "../../../components/form/atoms/ErrorMessage"
-import Label from "../../../components/form/atoms/Label"
 import DynamicArray from "../../../components/form/DynamicArray"
-import { useFieldError } from "../../../components/form/hooks/use-field-error"
+import Input from "../../../components/form/Input"
+import Select from "../../../components/form/Select"
 import type { MediaItem } from "../../../types/media-item"
 
 export default function Collections({
   control,
   collections,
+  defaultValue,
 }: {
   control: Control<MediaItem>
   collections: { id: string; labelText: string }[]
+  defaultValue: MediaItem["collections"]
 }) {
   return (
     <DynamicArray
@@ -19,13 +20,29 @@ export default function Collections({
       name="collections"
       label="ln.admin.collections"
       renderElement={(index) => (
-        <div className="flex w-full flex-col py-2">
-          <CollectionSelect
-            collections={collections}
+        <div className="flex w-full flex-col gap-4 py-2">
+          <Select
+            options={collections}
+            label="ln.admin.name"
+            labelSize="small"
+            preserveHintSpace={false}
+            name={`collections.${index}.collection`}
             control={control}
-            index={index}
+            defaultValue={defaultValue[index]?.collection}
+          />
+          <Input
+            type="number"
+            control={control}
+            label="ln.admin.position-in-collection"
+            labelSize="small"
+            step={1}
+            min={0}
+            preserveHintSpace={false}
+            defaultValue={defaultValue[index]?.index}
+            {...control.register(`collections.${index}.index`, {
+              setValueAs: (value) => (value === "" ? undefined : Number(value)),
+            })}
           />
-          <CollectionIndex control={control} index={index} />
         </div>
       )}
       addButton={{
@@ -39,65 +56,3 @@ export default function Collections({
     />
   )
 }
-
-function CollectionSelect({
-  control,
-  collections,
-  index,
-}: {
-  control: Control<MediaItem>
-  collections: { id: string; labelText: string }[]
-  index: number
-}) {
-  const name = `collections.${index}.collection` as const
-  const errorMessage = useFieldError({ name, control })
-  return (
-    <>
-      <Label for={name} label="ln.admin.name" size="xs" />
-      <select
-        {...control.register(name)}
-        id={name}
-        aria-invalid={!!errorMessage}
-        className={`dy-select dy-select-bordered text-base shadow-sm ${errorMessage ? "dy-select-error" : ""}`}
-      >
-        {collections.map(({ id, labelText }) => (
-          <option key={id} value={id}>
-            {labelText}
-          </option>
-        ))}
-      </select>
-      <ErrorMessage message={errorMessage} />
-    </>
-  )
-}
-
-function CollectionIndex({
-  control,
-  index,
-}: {
-  control: Control<MediaItem>
-  index: number
-}) {
-  const name = `collections.${index}.index` as const
-  const errorMessage = useFieldError({ name, control })
-  return (
-    <>
-      <Label
-        for={name}
-        label="ln.admin.position-in-collection"
-        size="xs"
-        className="mt-3"
-      />
-      <input
-        className={`dy-input dy-input-bordered shadow-inner ${errorMessage ? "dy-input-error" : ""}`}
-        aria-invalid={!!errorMessage}
-        type="number"
-        step={1}
-        {...control.register(name, {
-          setValueAs: (value) => (value === "" ? undefined : Number(value)),
-        })}
-      />
-      <ErrorMessage message={errorMessage} />
-    </>
-  )
-}

package/src/admin/types/media-item.ts

@@ -46,6 +46,7 @@ export const mediaItemSchema = z.object({
     .array()
     .superRefine(unique("collection")),
   dateCreated: z.string().date(INVALID_DATE),
+  description: z.string().optional(),
 })
 
 export type MediaItem = z.input<typeof mediaItemSchema>

package/src/components/HighlightSection.astro

@@ -53,7 +53,7 @@ const { image, id, title, text, link, className, titleClass, textClass } =
       {
         link && (
           <a
-            class="inline-flex items-center justify-center gap-2 rounded-2xl bg-primary px-6 py-3 text-sm font-bold uppercase text-gray-50 shadow-sm hover:bg-primary/85 hover:text-gray-100"
+            class="inline-flex items-center justify-center gap-2 rounded-2xl bg-primary px-6 py-3 text-sm font-bold text-gray-50 shadow-sm hover:bg-primary/85 hover:text-gray-100"
             href={link.href}
           >
             {link.text}

package/src/pages/details-page/components/main-details/OpenButton.astro

@@ -14,7 +14,7 @@ const content = createContentMetadata(item.data.content[0])
 ---
 
 <a
-  class="flex min-w-52 items-center justify-center gap-2 rounded-2xl bg-gray-800 px-6 py-3 font-bold uppercase text-gray-100 shadow-sm hover:bg-gray-950 hover:text-gray-300"
+  class="flex min-w-52 items-center justify-center gap-2 rounded-2xl bg-gray-800 px-6 py-3 font-bold text-gray-100 shadow-sm hover:bg-gray-950 hover:text-gray-300"
   href={content.url}
   target={content.target}
   hreflang={item.data.language}

package/src/utils/markdown.ts

@@ -19,6 +19,12 @@ export function markdownToText(markdown?: string) {
       .replaceAll(/^#+ ?/gm, "")
       // lists
       .replaceAll(/^- /gm, "")
+      // escaped white space
+      .replaceAll(/ /g, " ")
+      // underlines
+      .replaceAll(/<\/?u>/g, "")
+      // code block
+      .replaceAll(/^```[a-zA-Z ]*\n/gm, "")
       // block quotes
       .replaceAll(/^>+ ?/gm, "")
       // bold and italics

package/src/admin/components/form/atoms/Legend.tsx

@@ -1,20 +0,0 @@
-import { useI18n } from "../../../../i18n/react/useI18n"
-
-export default function Legend({
-  label,
-  size = "sm",
-  className,
-}: {
-  label: string
-  className?: string
-  size?: "sm" | "xs"
-}) {
-  const { t } = useI18n()
-  return (
-    <legend
-      className={`pb-2 font-bold uppercase text-gray-500 ${size === "sm" ? "text-sm" : "text-xs"} ${className}`}
-    >
-      {t(label)}
-    </legend>
-  )
-}