@oslokommune/punkt-react 18.0.0 → 18.1.0

package/src/components/fileupload/FileUpload.tsx

@@ -27,6 +27,7 @@ import {
   useState,
 } from 'react'
 
+import { type IPktFileUploadBase } from 'shared-types'
 import {
   countFileTransferStates,
   resolveAcceptAttribute,
@@ -51,95 +52,51 @@ import {
   TItemRenderer,
   PktFileUploadContext,
   TQueueItemOperation,
-  TUploadStrategy,
 } from './types'
 import { usePktStrings } from '../../hooks/usePktStrings'
-import { formatString, plural, type TPktStringsOverride } from 'shared-strings'
+import { formatString, plural } from 'shared-strings'
 
-// Re-export for external use
 export { formatFileSize, parseFileSize } from 'shared-utils/fileupload'
 
 /**
  * Shared props for `PktFileUpload` (both `form` and `custom` strategies).
  */
-interface IBaseFileUploadProps extends Omit<
-  InputHTMLAttributes<HTMLInputElement>,
-  'checked' | 'size' | 'type' | 'value' | 'onChange' | 'width' | 'defaultValue'
-> {
+interface IBaseFileUploadProps
+  extends
+    Omit<
+      IPktFileUploadBase,
+      | 'helptext'
+      | 'helptextDropdown'
+      | 'itemRenderer'
+      | 'extraOperations'
+      | 'value'
+      | 'defaultValue'
+      | 'onFilesChanged'
+      | 'onFileUploadRequested'
+    >,
+    Omit<
+      InputHTMLAttributes<HTMLInputElement>,
+      'checked' | 'size' | 'type' | 'value' | 'onChange' | 'width' | 'defaultValue' | 'name'
+    > {
   /** Called with the next file list when files are added/removed/updated. */
   onFilesChanged?: (files: TFileItemList) => void
-  /** Allow selecting/dropping multiple files. */
-  multiple?: boolean
-  /** Controlled value (recommended). */
-  value?: TFileItemList
-  /** Upload mode. Defaults to `"form"`. */
-  uploadStrategy?: TUploadStrategy
-  /** Field name. Used for native input (`form`) or hidden ID inputs (`custom`). */
-  name: string
-  /** Enable comment operation (disabled automatically in thumbnail view). */
-  addCommentsEnabled?: boolean
-  /** Enable rename operation (disabled automatically in thumbnail view). */
-  renameFilesEnabled?: boolean
-  /** Renderer for queue items (`filename`, `thumbnail`, or custom function). */
-  itemRenderer?: keyof typeof ItemRenderers | TItemRenderer
-  /** Number of trailing characters to keep when truncating long filenames. */
-  truncateTail?: number
   /**
    * Called immediately when a file is added in `uploadStrategy="custom"`.
    * Use it to start uploading the file and update `transfers`.
    */
   onFileUploadRequested?: (fileItem: FileItem) => void
+  /** Controlled value (recommended). */
+  value?: TFileItemList
   /** Uncontrolled initial value (use either `value` or `defaultValue`, not both). */
   defaultValue?: TFileItemList
-  /** Extra operations appended after built-ins (rename/comment). */
-  extraOperations?: Array<TQueueItemOperation>
-  /** Stretch to full container width (drop zone + queue). */
-  fullwidth?: boolean
-  /** Allowed formats for built-in validation (extensions like `pdf`, or MIME patterns like `image/*`). */
-  allowedFormats?: string[]
-  /** Custom message for invalid format. Use `{formats}` placeholder. */
-  formatErrorMessage?: string
-  /** Max file size (e.g. `"5MB"` or bytes). */
-  maxFileSize?: string | number
-  /** Custom message for size validation. Use `{maxSize}` placeholder. */
-  sizeErrorMessage?: string
-  /** Optional additional validation hook (runs after built-in format/size checks). Return string to block. */
-  onFileValidation?: (file: File) => string | null
-  /**
-   * Low-level validation escape hatch — Lit parity with the `file-validate` CustomEvent.
-   * Receives a detail object whose `errorMessage` can be mutated; set it to reject the file.
-   */
-  onFileValidate?: (detail: TFileValidateDetail) => void
-  /** External/programmatic error message shown under the component. */
-  errorMessage?: string
-  /** External error flag (combined with internal validation errors). */
-  hasError?: boolean
-  /** Disable the whole component (no interaction). */
-  disabled?: boolean
-  /** Optional label/title (wraps the component in `PktInputWrapper`). */
-  label?: string
+  /** Renderer for queue items (`filename`, `thumbnail`, or custom function). */
+  itemRenderer?: keyof typeof ItemRenderers | TItemRenderer
   /** Help text under the label. */
   helptext?: string | ReactNode
   /** Expandable help text (dropdown). */
   helptextDropdown?: string | ReactNode
-  /** Button label for expandable help text. */
-  helptextDropdownButton?: string
-  /** Shows an "optional" tag. */
-  optionalTag?: boolean
-  /** Label text for the optional tag. */
-  optionalText?: string
-  /** Shows a "required" tag. */
-  requiredTag?: boolean
-  /** Label text for the required tag. */
-  requiredText?: string
-  /** Extra tag next to the label. */
-  tagText?: string | null
-  /** Marks the upload as required. Native validation is used in `form`; submit validation in `custom`. */
-  required?: boolean
-  /** Overstyrer tekster for denne komponenten. */
-  strings?: TPktStringsOverride
-  /** Enable image preview modal (only applies to thumbnail renderer). */
-  enableImagePreview?: boolean
+  /** Extra operations appended after built-ins (rename/comment). */
+  extraOperations?: Array<TQueueItemOperation>
 }
 
 interface IFileInputFileUploadProps

package/src/components/index.ts

@@ -61,4 +61,4 @@ export {
   setPktStrings,
   subscribePktStrings,
 } from 'shared-strings'
-export type { TPktStrings, TPktStringsNamespace, TPktStringsOverride } from 'shared-strings'
+export type { TPktStrings, TPktStringsNamespace, TPktStringsOverride, IPktStringsProps } from 'shared-strings'

package/src/components/link/Link.tsx

@@ -2,6 +2,7 @@
 
 import classNames from 'classnames'
 import { AnchorHTMLAttributes, FC, LinkHTMLAttributes, ReactNode } from 'react'
+import type { TRenderLink } from 'shared-types'
 
 import { PktIcon } from '../icon/Icon'
 
@@ -12,12 +13,7 @@ interface IPktLink extends LinkHTMLAttributes<HTMLAnchorElement> {
   iconPosition?: string | undefined
   external?: boolean
   target?: string | undefined
-  renderLink?: (args: {
-    href: string
-    className: string
-    children: ReactNode
-    props: AnchorHTMLAttributes<HTMLAnchorElement>
-  }) => ReactNode
+  renderLink?: TRenderLink<ReactNode, AnchorHTMLAttributes<HTMLAnchorElement>>
 }
 
 export const PktLink: FC<IPktLink> = ({