@qoretechnologies/reqraft 0.10.13-pr.74.gf718c08 → 0.10.14

package/src/components/form/engine/FormEngine.tsx

@@ -21,13 +21,13 @@ import {
 } from '@qoretechnologies/reqore/dist/components/Panel';
 import { IReqoreFormTemplates } from '@qoretechnologies/reqore/dist/components/Textarea';
 import { TReqoreIntent } from '@qoretechnologies/reqore/dist/constants/theme';
-import { IReqoreIconName } from '@qoretechnologies/reqore/dist/types/icons';
 import {
   changeDarkness,
   getMainBackgroundColor,
   getReadableColor,
   percentToHexAlpha,
 } from '@qoretechnologies/reqore/dist/helpers/colors';
+import { IReqoreIconName } from '@qoretechnologies/reqore/dist/types/icons';
 import {
   IQorusFormField,
   IQorusFormFieldMessage,
@@ -48,11 +48,10 @@ import reduce from 'lodash/reduce';
 import size from 'lodash/size';
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useMeasure, useMount, useUpdateEffect } from 'react-use';
-import { createContext } from 'use-context-selector';
 import styled from 'styled-components';
+import { createContext } from 'use-context-selector';
 import { getDefaultValue, insertAtIndex, richtextToString } from '../../../helpers/common';
 import { getRequiredOptionMessage } from '../../../helpers/options';
-import { query } from '../../../utils/fetch';
 import {
   IValidationResult,
   hasAllDependenciesFullfilled,
@@ -61,6 +60,7 @@ import {
 } from '../../../helpers/validations';
 import { useQorusTypes } from '../../../hooks/useQorusTypes';
 import { useTemplates } from '../../../hooks/useTemplates';
+import { query } from '../../../utils/fetch';
 import { Description } from '../../Description';
 import { FocusedEditing } from '../../FocusedEditing';
 import { SelectFormField } from '../fields/select/Select';
@@ -72,12 +72,6 @@ import {
 } from '../fields/template/TemplateField';
 import { CompactRow } from './CompactRow';
 import { CompactRowContext, ICompactRowContext } from './compactRowContext';
-import { CompactToolbar } from './CompactToolbar';
-import {
-  CompactToolbarContext,
-  ICompactToolbarContext,
-  TCompactSort,
-} from './compactToolbarContext';
 import {
   GROUP_INDENT,
   LABEL_COL_MAX,
@@ -91,9 +85,16 @@ import {
   StyledStatusBox,
   StyledStatusBoxGroupLabel,
 } from './compactRowStyles';
+import { CompactToolbar } from './CompactToolbar';
+import {
+  CompactToolbarContext,
+  ICompactToolbarContext,
+  TCompactSort,
+} from './compactToolbarContext';
 import { OptionFieldMessages } from './OptionFieldMessages';
 import { OptionsHelpDialog } from './OptionsHelpDialog';
 import {
+  TReadFirstStatus,
   getFirstAttentionOptionName,
   getOptionGroup,
   getOptionGroupLabel,
@@ -101,7 +102,6 @@ import {
   getReadFirstCompletion,
   getReadFirstStatus,
   isOptionValueEmpty,
-  TReadFirstStatus,
 } from './readFirst';
 
 // Re-export types for consumers
@@ -201,13 +201,6 @@ const StyledCompactWrap = styled.div<{ $flush?: boolean }>`
      engage instead of overflowing the container horizontally. */
   min-width: 0;
   max-width: 100%;
-  /* A bit of horizontal breathing room for the whole form (header + content
-     alike). Horizontal only — top padding would break the sticky toolbar's
-     flush pin (see the scroll-context note below). Dropped to flush via the
-     compactFlush prop, for embeds that own their own gutters (e.g. the
-     SchemaDefinition tab body). */
-  padding: ${({ $flush }) => ($flush ? '0' : '0 12px')};
-
   /* Own our scroll context instead of borrowing the host's. The sticky toolbar
      pins to whatever scrolls; if that scroller carries top padding (e.g. a
      ReqorePanel/ReqoreContent body), sticky \`top: 0\` resolves against its
@@ -525,6 +518,18 @@ export interface IFormEngineProps extends Omit<IReqoreCollectionProps, 'onChange
    * transparently inside the parent's edit card. Default `false`.
    */
   compactNested?: boolean;
+  /**
+   * Compact mode only: props forwarded to the read-first form's outer
+   * `ReqorePanel` — the panel that carries the sticky toolbar header and holds
+   * the status boxes. Spread AFTER the engine's own defaults, so anything set
+   * here wins (`flat`, `raised`, `minimal`, `stickyHeader`, `label`, `icon`,
+   * `intent`, `padded`, `size`, …). Two props merge instead of replacing, so a
+   * consumer can add to the panel without dismantling the form:
+   * - `actions` — appended after the engine's toolbar action.
+   * - `contentStyle` — merged over the engine's flex-column layout.
+   * No-op in classic (non-compact) mode.
+   */
+  compactPanelProps?: IReqorePanelProps;
   /** Compact mode only: per-group display metadata (label / icon / subtitle /
    * order) — the server only sends the bare group key. */
   groups?: Record<string, IFormEngineGroup>;
@@ -609,6 +614,7 @@ export const FormEngine = ({
   compact,
   compactFlush = false,
   compactNested = false,
+  compactPanelProps,
   commitMode = 'immediate',
   expandMode = 'single',
   onCommit,
@@ -1709,8 +1715,13 @@ export const FormEngine = ({
         <>
           {(() => {
             const schemaMsgs = (
-              suppressSchemaMessages ? [] : (options?.[optionName] as any)?.messages || []
-            ) as { intent?: string; title?: string; content?: string }[];
+              suppressSchemaMessages ?
+                []
+              : (options?.[optionName] as any)?.messages || []) as {
+              intent?: string;
+              title?: string;
+              content?: string;
+            }[];
             if (!schemaMsgs.length) return null;
             const items = schemaMsgs.map(({ intent, title, content }, index) => (
               <ReqoreMessage
@@ -2114,7 +2125,13 @@ export const FormEngine = ({
     ]
   );
 
-  const compactHeaderActions = useMemo(() => [{ as: CompactToolbar, responsive: false }], []);
+  // The engine's own toolbar action, plus whatever the consumer added through
+  // `compactPanelProps.actions` — appended, so an outside action can never
+  // knock the form's toolbar out of the header.
+  const compactHeaderActions = useMemo(
+    () => [{ as: CompactToolbar, responsive: false }, ...(compactPanelProps?.actions || [])],
+    [compactPanelProps?.actions]
+  );
   const renderCompact = () => {
     const headerBg = `${changeDarkness(getMainBackgroundColor(theme), 0.02)}${percentToHexAlpha(88)}`;
     // Toolbar filters narrow the listed rows; the meter reflects the full set.
@@ -2357,22 +2374,24 @@ export const FormEngine = ({
                   $headerBg={compactNested ? 'transparent' : headerBg}
                   $nested={compactNested}
                   flat
+                  raised
+                  minimal
                   // No panel background: the form sits transparently on whatever
                   // hosts it (page, drawer, or — for an arg_schema field — the
                   // parent's edit card) instead of stacking its own dark surface.
                   // The status boxes keep their own tints; the sticky toolbar keeps
                   // its blurred header via the $headerBg override.
-                  transparent
                   stickyHeader={!compactNested}
-                  padded={false}
+                  // Consumer overrides land last so they win over every default
+                  // above; `actions` and `contentStyle` below merge rather than
+                  // replace (see `compactPanelProps`).
+                  {...compactPanelProps}
                   actions={compactHeaderActions}
                   contentStyle={{
                     display: 'flex',
                     flexFlow: 'column',
                     gap: '10px',
-                    // Nested sub-form: no surrounding panel padding (it's flush in
-                    // the parent card); top-level keeps a small bottom gutter.
-                    padding: compactNested ? '0' : '0 0 12px',
+                    ...compactPanelProps?.contentStyle,
                   }}
                 >
                   {size(groupKeys) === 0 ?

package/src/components/form/engine/compactRowStyles.ts

@@ -47,14 +47,13 @@ export const StyledCompactPanel = styled(ReqorePanel)<{
   $nested?: boolean;
 }>`
   > .reqore-panel-title {
-    background: ${({ $headerBg }) => $headerBg};
     /* The blur + translateZ exist only to make the STICKY top-level toolbar ghost
        content beneath it; a nested sub-form's header isn't sticky, so skip them
        (and the stacking context translateZ creates). */
     ${({ $nested }) =>
-      $nested ?
-        ''
-      : 'backdrop-filter: blur(6px); -webkit-backdrop-filter: blur(6px); transform: translateZ(0);'}
+      $nested ? '' : (
+        'backdrop-filter: blur(6px); -webkit-backdrop-filter: blur(6px); transform: translateZ(0);'
+      )}
     padding-top: ${GAP_FROM_SIZE[HEADER_GAP]}px;
     padding-bottom: ${GAP_FROM_SIZE[HEADER_GAP]}px;
   }
@@ -625,5 +624,4 @@ export const StyledGroupBody = styled.div<{
     padding-top: 0;
     padding-bottom: 0;
   }
-
 `;

package/src/helpers/common.ts

@@ -174,25 +174,6 @@ export const splitByteSize = (value?: string): [number | undefined, string | und
   return [amount?.[0] ? Number(amount[0]) : undefined, unit?.[0]];
 };
 
-/** Human-readable file size, e.g. `"12.3 KB"` — whole bytes below 1 KiB, one
- *  decimal above. Shared by the ticket thread / references attachment rows. */
-export const formatBytes = (bytes: number): string => {
-  if (bytes < 1024) {
-    return `${bytes} B`;
-  }
-  const units = ['KB', 'MB', 'GB'];
-  let value = bytes / 1024;
-  let unit = 0;
-  while (value >= 1024 && unit < units.length - 1) {
-    value /= 1024;
-    unit += 1;
-  }
-  return `${value.toFixed(1)} ${units[unit]}`;
-};
-
-/** True when a MIME content type is an image (`image/*`). */
-export const isImage = (contentType: string): boolean => contentType.startsWith('image/');
-
 // URL value splitting (IDE `urlField.tsx` behavior). Lives here rather than
 // in the Url component so `validations.ts` can use it without pulling the
 // component chain into non-DOM consumers (jest).

package/src/hooks/useStorage/useStorage.stories.tsx

@@ -1,5 +1,6 @@
 import { ReqoreButton, ReqoreControlGroup, ReqoreP } from '@qoretechnologies/reqore';
 import { StoryObj } from '@storybook/react-vite';
+import { useRef } from 'react';
 import { fireEvent, within } from 'storybook/test';
 import { storiesStorageMock } from '../../../__tests__/ mock';
 import { testsWaitForText } from '../../../__tests__/utils';
@@ -93,6 +94,57 @@ export const ValueCanBeUpdated: Story = {
   },
 };
 
+/**
+ * Regression for the "stale updater clobbers other keys" bug: the storage
+ * updater must persist onto the LATEST storage blob, not the one captured in
+ * its closure. Long-lived callers (an imperative store subscription, a ref to
+ * the mount-time setter) hold an old updater; writing through it must not wipe
+ * keys other hooks wrote in the meantime.
+ */
+export const StaleUpdaterDoesNotClobberOtherKeys: Story = {
+  args: { reqraftOptions: { waitForStorage: true } },
+  parameters: {
+    docs: {
+      description: {
+        story:
+          "Renders two useReqraftStorage keys and captures the mount-time setter for the first one (a deliberately STALE updater). After a second key is written, writing through the stale updater must keep the second key intact — proving storage writes merge onto the latest blob rather than a closure copy. This is the regression test for page-visit tracking wiping other stored settings.",
+      },
+    },
+    mockData: [...storiesStorageMock],
+  },
+  render: () => {
+    const [someVal, setSomeVal] = useReqraftStorage<string>('some-path', 'default');
+    const [keyB] = useReqraftStorage<string>('key-b', 'b-default');
+    const [, setKeyB] = useReqraftStorage<string>('key-b', 'b-default');
+    // Capture the mount-time setter — it stays stale once other keys change.
+    const staleSetSomeVal = useRef(setSomeVal);
+
+    return (
+      <ReqoreControlGroup vertical>
+        <ReqoreP>{`some-path: ${someVal}`}</ReqoreP>
+        <ReqoreP>{`key-b: ${keyB}`}</ReqoreP>
+        <ReqoreButton onClick={() => setKeyB('b-written')}>Write B</ReqoreButton>
+        <ReqoreButton onClick={() => staleSetSomeVal.current('a-written')}>
+          Write A (stale)
+        </ReqoreButton>
+      </ReqoreControlGroup>
+    );
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    await testsWaitForText('some-path: This is a storage value');
+    // Write a second key through its own (fresh) updater.
+    await fireEvent.click(canvas.getByText('Write B'));
+    await testsWaitForText('key-b: b-written');
+    // Write the first key through the STALE mount-time updater.
+    await fireEvent.click(canvas.getByText('Write A (stale)'));
+    await testsWaitForText('some-path: a-written');
+    // The stale write must NOT have wiped the second key.
+    await testsWaitForText('key-b: b-written');
+  },
+};
+
 export const ValueCanBeRemoved: Story = {
   ...StorageValue,
   parameters: {

package/src/index.tsx

@@ -10,8 +10,6 @@ export {
   validateOptionWithRequiredGroups,
 } from './helpers/validations';
 export type { IValidationResult } from './helpers/validations';
-export { thinScrollbar } from './helpers/scrollbar';
-export * from './components/imageLightbox';
 export { ReqraftMenu } from './components/menu/Menu';
 export type {
   IReqraftMenuItem,
@@ -54,9 +52,6 @@ export type {
   ILspTextEdit,
   TLspDocumentText,
 } from './utils/lspClient.types';
-export * from './components/composer';
 export * from './components/smartEditor';
 export * from './components/dpqlEditor';
 export * from './components/qonsoleSmartInput';
-export * from './components/supportTicket';
-export * from './components/ticketThread';

package/src/providers/StorageProvider.tsx

@@ -9,6 +9,23 @@ import { TReqraftStorageValue } from '../hooks/useStorage/useStorage';
 import { currentUserStore } from '../stores/currentUser/currentUser';
 import { IReqraftProviderProps } from './ReqraftProvider';
 
+/**
+ * Apply a single path write onto the current storage blob, seeding a fresh object
+ * when the user has no storage yet.
+ *
+ * `?? {}` is load-bearing: a user who has never written storage has
+ * `storage === undefined | null`, and `set(cloneDeep(undefined), …)` returns
+ * `undefined` (lodash won't set on a nullish target). Without the seed the FIRST
+ * write for such a user — e.g. accepting the cookie-consent banner — persists an
+ * empty body and silently drops the value, so the flag stays unset forever and
+ * the banner never closes. Exported for testing.
+ */
+export const applyStorageWrite = (
+  storage: TReqraftStorage | undefined,
+  path: string,
+  value: unknown
+): TReqraftStorage => set(cloneDeep(storage) ?? {}, path, value);
+
 export interface IReqraftStorageProviderProps
   extends Pick<IReqraftProviderProps, 'waitForStorage'> {
   children: ReactNode;
@@ -53,26 +70,35 @@ export const ReqraftUserProvider = ({ children, waitForStorage }: IReqraftStorag
       includeAppPrefix: boolean = true
     ) {
       const _path = includeAppPrefix ? `${appName}.${path}` : path;
-      const updatedStorage = set(cloneDeep(currentUser?.storage), _path, value);
+      // Base the write on the LATEST storage read straight from the store, not
+      // the blob captured in this callback's closure. A caller holding a stale
+      // updater — e.g. an imperative store subscription created on mount, before
+      // other keys had loaded — would otherwise persist an out-of-date blob and
+      // wipe every key written to storage since its closure was captured.
+      const latestStorage = currentUserStore.getState().currentUser?.storage;
+      const updatedStorage = applyStorageWrite(latestStorage, _path, value);
 
       updateCurrentUserStorage(updatedStorage);
 
       load({ body: { storage: updatedStorage } });
     },
-    [appName, currentUser?.storage, load, updateCurrentUserStorage]
+    [appName, load, updateCurrentUserStorage]
   );
 
   const removeStorageValue = useCallback(
     function (path: string, includeAppPrefix: boolean = true) {
       const _path = includeAppPrefix ? `${appName}.${path}` : path;
 
-      const updatedStorage = set(cloneDeep(currentUser?.storage), _path, null);
+      // Same as `updateStorage`: mutate the LATEST blob (never a stale closure
+      // copy), seeding a fresh object when there's no storage yet.
+      const latestStorage = currentUserStore.getState().currentUser?.storage;
+      const updatedStorage = applyStorageWrite(latestStorage, _path, null);
 
       updateCurrentUserStorage(updatedStorage);
 
       load({ body: { storage_path: _path } });
     },
-    [appName, currentUser?.storage, load, updateCurrentUserStorage]
+    [appName, load, updateCurrentUserStorage]
   );
 
   const contextValue = useMemo(

package/dist/components/composer/Composer.d.ts

@@ -1,108 +0,0 @@
-import { ReqoreButton, ReqoreDropdown, ReqoreTextarea } from '@qoretechnologies/reqore';
-import { StyledEffect } from '@qoretechnologies/reqore/dist/components/Effect';
-import type { IReqoreIconName } from '@qoretechnologies/reqore/dist/types/icons';
-import { ComponentProps, KeyboardEvent as ReactKeyboardEvent, ReactNode } from 'react';
-/** Reqore's intent / effect / theme unions, without guessing import paths. */
-type TIntent = ComponentProps<typeof ReqoreButton>['intent'];
-type TEffect = ComponentProps<typeof StyledEffect>['effect'];
-type TCustomTheme = ComponentProps<typeof ReqoreButton>['customTheme'];
-/** The exact `items` shape ReqoreDropdown accepts. */
-type TDropdownItems = NonNullable<ComponentProps<typeof ReqoreDropdown>['items']>;
-/** Which editor the composer renders. */
-export type TComposerEditor = 'rich' | 'plain';
-/** One send action. With more than one, the send button splits into a primary
- *  button (the first action) + a caret dropdown listing them all. `id` is echoed
- *  back to `onSend` so the caller knows which action fired. */
-export interface IComposerSendAction {
-    id?: string;
-    /** button label; omit for an icon-only button (like the Qonsole send). */
-    label?: string;
-    icon?: IReqoreIconName;
-    intent?: TIntent;
-    /** per-button Reqore theme (e.g. `{ main: 'custom1' }` for the Qonsole accent). */
-    customTheme?: TCustomTheme;
-    /** render the button minimal (subtle, blends into the bar — the Qonsole style). */
-    minimal?: boolean;
-}
-/** Imperative handle for consumers that drive the editor externally (e.g. the
- *  Qonsole input inserting a completion or navigating history). */
-export interface IComposerHandle {
-    focus: () => void;
-    clear: () => void;
-    setText: (text: string) => void;
-    getText: () => string;
-}
-export interface IComposerProps {
-    /** Editor flavour. `rich` = ReqoreRichTextEditor (default), `plain` = ReqoreTextarea. */
-    editor?: TComposerEditor;
-    /** Initial draft text (also seeds the editor for a restored draft / a story). */
-    defaultText?: string;
-    /** Initial staged files (a restored draft's attachments, or a demo). */
-    defaultFiles?: File[];
-    placeholder?: string;
-    /**
-     * Submit the composed message. `text` is the plain-string body; `files` are the
-     * staged attachments (raw `File`s — the caller converts to its own upload shape);
-     * `action` is the chosen send action's `id` (undefined for the default button).
-     */
-    onSend: (text: string, options: {
-        files: File[];
-        action?: string;
-    }) => void | Promise<void>;
-    /** Single-button label / icon / intent (ignored when `sendActions` is set). */
-    sendLabel?: string;
-    sendIcon?: IReqoreIconName;
-    sendIntent?: TIntent;
-    /** Default send button: minimal (subtle, Qonsole-style). Default `true`. */
-    sendMinimal?: boolean;
-    /** Default send button accent (Reqore `customTheme`). Default `{ main: 'custom1' }`
-     *  — the Qorus accent, which each app's theme colours (gray in a bare reqore theme). */
-    sendCustomTheme?: TCustomTheme;
-    /** Multiple send actions → a split send button. The first is the primary. */
-    sendActions?: IComposerSendAction[];
-    /** className on the split-send caret dropdown (keeps consumer test hooks, e.g.
-     *  the helpdesk `ticket-send-more`). */
-    sendMenuClassName?: string;
-    /** the send round-trip is in flight */
-    sending?: boolean;
-    /** disabled → renders a muted notice with `disabledReason` instead of the composer */
-    disabled?: boolean;
-    disabledReason?: string;
-    /** submit on plain Enter (Shift/Ctrl/Alt/Meta+Enter insert a newline). Default true. */
-    submitOnEnter?: boolean;
-    /** clear the editor + staged files after a resolved send. Default true. */
-    clearOnSend?: boolean;
-    /** allow sending with empty text (e.g. attachments only). Default false. */
-    allowEmptySend?: boolean;
-    /** Extra attach-menu entries beyond "Upload files" (receives `addFiles`). With any
-     *  entry the attach control becomes a dropdown; otherwise a plain button. */
-    attachMenuItems?: (addFiles: (files: File[]) => void) => TDropdownItems;
-    /** the attach control icon (Qonsole uses `AddLine`). */
-    attachIcon?: IReqoreIconName;
-    /** hide the attach control entirely. */
-    hideAttach?: boolean;
-    /** Slots: `toolbarStart` sits after attach on the left (e.g. the Qonsole slash
-     *  dropdown), `footerActions` after it (e.g. a reference toggle), `rightActions`
-     *  left of send (e.g. the Qonsole design button), `aboveInput` on top of the
-     *  editor inside the bar (e.g. reference chips), and `belowInput` under the bar. */
-    toolbarStart?: ReactNode;
-    footerActions?: ReactNode;
-    rightActions?: ReactNode;
-    aboveInput?: ReactNode;
-    belowInput?: ReactNode;
-    /** Hooks for consumers layering behaviour on the editor (completions, history). */
-    onChange?: (text: string) => void;
-    onEditorKeyDown?: (e: ReactKeyboardEvent) => void;
-    onFocus?: () => void;
-    onBlur?: () => void;
-    /** editor sizing */
-    size?: ComponentProps<typeof ReqoreTextarea>['size'];
-    /** drop the composer's outer margin (for tight embeds). */
-    minimal?: boolean;
-    /** override the bar's gradient / effect (qorus-ide passes its `custom1` accent to
-     *  match the Qonsole floating bar exactly). */
-    effect?: TEffect;
-}
-export declare const Composer: import("react").ForwardRefExoticComponent<IComposerProps & import("react").RefAttributes<IComposerHandle>>;
-export {};
-//# sourceMappingURL=Composer.d.ts.map

package/dist/components/composer/Composer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Composer.d.ts","sourceRoot":"","sources":["../../../src/components/composer/Composer.tsx"],"names":[],"mappings":"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"}