@dr.pogodin/react-utils 1.38.0 → 1.39.0

package/build/types-code/index.d.ts

@@ -2,7 +2,6 @@ import 'styles/global.scss';
 import type ServerT from './server';
 declare const server: (typeof ServerT) | null;
 declare const client: any;
-export { default as api } from 'axios';
 export { type AsyncCollectionLoaderT, type AsyncDataEnvelopeT, type AsyncDataLoaderT, type ForceT, type UseAsyncDataOptionsT, type UseAsyncDataResT, type UseGlobalStateResT, type ValueOrInitializerT, getGlobalState, GlobalStateProvider, newAsyncDataEnvelope, useAsyncCollection, useAsyncData, useGlobalState, withGlobalStateType, } from '@dr.pogodin/react-global-state';
 export * from './shared/components';
 export { type Listener, type Theme, config, Barrier, Emitter, isomorphy, getSsrContext, Semaphore, splitComponent, themed, ThemeProvider, time, webpack, withRetries, } from './shared/utils';

package/build/types-code/shared/components/Button/index.d.ts

@@ -9,6 +9,7 @@ type PropsT = {
     onMouseDown?: React.MouseEventHandler;
     openNewTab?: boolean;
     replace?: boolean;
+    testId?: string;
     theme: Theme<'active' | 'button' | 'disabled'>;
     to?: object | string;
 };

package/build/types-code/shared/components/Input/index.d.ts

@@ -2,6 +2,7 @@ import { type Theme } from '@dr.pogodin/react-themes';
 type ThemeKeyT = 'container' | 'input' | 'label';
 declare const _default: import("@dr.pogodin/react-themes").ThemedComponent<React.InputHTMLAttributes<HTMLInputElement> & {
     label?: React.ReactNode;
+    testId?: string;
     theme: Theme<ThemeKeyT>;
 } & React.RefAttributes<HTMLInputElement>>;
 export default _default;

package/build/types-code/shared/components/Modal/index.d.ts

@@ -3,10 +3,13 @@ import { type Theme } from '@dr.pogodin/react-themes';
 type PropsT = {
     cancelOnScrolling?: boolean;
     children?: ReactNode;
-    containerStyle?: React.CSSProperties;
     dontDisableScrolling?: boolean;
     onCancel?: () => void;
+    style?: React.CSSProperties;
+    testId?: string;
     theme: Theme<'container' | 'overlay'>;
+    /** @deprecated */
+    containerStyle?: React.CSSProperties;
 };
 /**
  * The `<Modal>` component implements a simple themeable modal window, wrapped

package/build/types-code/shared/components/selectors/common.d.ts

@@ -11,6 +11,7 @@ export type PropsT<NameT, OnChangeT = React.ChangeEventHandler<HTMLSelectElement
     label?: React.ReactNode;
     onChange?: OnChangeT;
     options?: Readonly<OptionsT<NameT>>;
+    testId?: string;
     theme: Theme<ThemeKeyT>;
     value?: ValueT;
 };

package/build/types-code/shared/utils/jest/index.d.ts

@@ -1,3 +1,4 @@
+import type { AxiosRequestConfig, AxiosResponse } from 'axios';
 import { type ReactNode, act } from 'react';
 import { type RenderResult } from '@testing-library/react';
 /**
@@ -25,6 +26,8 @@ export declare function unmockClientSide(): void;
  * @return {string}
  */
 export declare function getMockUuid(seed?: number): string;
+export type AxiosRequestHandlerT = (config: AxiosRequestConfig) => Partial<AxiosResponse> | null | undefined;
+export declare function mockAxios(handlers: AxiosRequestHandlerT[]): any;
 /**
  * Advances mock timers, and mock date by the specified time.
  * @param {number} time Time step [ms].
@@ -34,6 +37,7 @@ export declare function getMockUuid(seed?: number): string;
 export declare function mockTimer(time: number): Promise<void>;
 export type MountedSceneT = HTMLElement & {
     destroy: () => void;
+    snapshot: () => void;
 };
 /**
  * Mounts `scene` to the DOM, and returns the root scene element.

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.38.0",
+  "version": "1.39.0",
   "bin": {
     "react-utils-build": "bin/build.js",
     "react-utils-setup": "bin/setup.js"
@@ -30,14 +30,14 @@
     "lodash": "^4.17.21",
     "morgan": "^1.10.0",
     "node-forge": "^1.3.1",
-    "qs": "^6.12.2",
+    "qs": "^6.12.3",
     "raf": "^3.4.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-helmet": "^6.1.0",
     "react-router-dom": "^6.24.1",
     "request-ip": "^3.3.0",
-    "rimraf": "^5.0.7",
+    "rimraf": "^6.0.0",
     "serialize-javascript": "^6.0.2",
     "serve-favicon": "^2.5.0",
     "source-map-support": "^0.5.21",
@@ -59,7 +59,7 @@
     "@dr.pogodin/babel-plugin-transform-assets": "^1.2.2",
     "@dr.pogodin/babel-preset-svgr": "^1.8.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
-    "@testing-library/dom": "^10.3.0",
+    "@testing-library/dom": "^10.3.1",
     "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.5.2",
     "@tsconfig/recommended": "^1.0.7",
@@ -113,7 +113,7 @@
     "react-refresh": "^0.14.2",
     "regenerator-runtime": "^0.14.1",
     "resolve-url-loader": "^5.0.0",
-    "sass": "^1.77.6",
+    "sass": "^1.77.7",
     "sass-loader": "^14.2.1",
     "sitemap": "^8.0.0",
     "stylelint": "^16.6.1",
@@ -123,7 +123,7 @@
     "tstyche": "^2.0.0",
     "typed-scss-modules": "^8.0.1",
     "typescript": "^5.5.3",
-    "typescript-eslint": "^7.15.0",
+    "typescript-eslint": "^7.16.0",
     "webpack": "^5.92.1",
     "webpack-dev-middleware": "^7.2.1",
     "webpack-hot-middleware": "^2.26.1",

package/src/index.ts

@@ -8,8 +8,6 @@ const server = webpack.requireWeak('./server', __dirname) as (typeof ServerT) |
 
 const client = server ? undefined : require('./client').default;
 
-export { default as api } from 'axios';
-
 export {
   type AsyncCollectionLoaderT,
   type AsyncDataEnvelopeT,

package/src/shared/components/Button/index.tsx

@@ -17,6 +17,7 @@ type PropsT = {
   onMouseDown?: React.MouseEventHandler;
   openNewTab?: boolean;
   replace?: boolean;
+  testId?: string;
   theme: Theme<'active' | 'button' | 'disabled'>;
   // TODO: It needs a more precise typing of the object option.
   to?: object | string;
@@ -32,6 +33,7 @@ export const BaseButton: React.FunctionComponent<PropsT> = ({
   onMouseDown,
   openNewTab,
   replace,
+  testId,
   theme,
   to,
 }) => {
@@ -40,7 +42,7 @@ export const BaseButton: React.FunctionComponent<PropsT> = ({
   if (disabled) {
     if (theme.disabled) className += ` ${theme.disabled}`;
     return (
-      <div className={className}>
+      <div className={className} data-testid={testId}>
         {children}
       </div>
     );
@@ -49,6 +51,7 @@ export const BaseButton: React.FunctionComponent<PropsT> = ({
     return (
       <Link
         className={className}
+        data-testid={testId}
         enforceA={enforceA}
         onClick={onClick}
         onMouseDown={onMouseDown}
@@ -64,6 +67,7 @@ export const BaseButton: React.FunctionComponent<PropsT> = ({
   return (
     <div
       className={className}
+      data-testid={testId}
       onClick={onClick}
       onKeyDown={onClick && ((e) => {
         if (e.key === 'Enter') onClick(e);

package/src/shared/components/Input/index.tsx

@@ -11,6 +11,7 @@ type ThemeKeyT =
 
 type PropsT = React.InputHTMLAttributes<HTMLInputElement> & {
   label?: React.ReactNode;
+  testId?: string;
   theme: Theme<ThemeKeyT>;
 };
 
@@ -26,6 +27,7 @@ type PropsT = React.InputHTMLAttributes<HTMLInputElement> & {
 const Input = forwardRef<HTMLInputElement, PropsT>((
   {
     label,
+    testId,
     theme,
     ...rest
   }: PropsT,
@@ -35,6 +37,7 @@ const Input = forwardRef<HTMLInputElement, PropsT>((
     { label === undefined ? null : <div className={theme.label}>{label}</div> }
     <input
       className={theme.input}
+      data-testid={testId}
       ref={ref}
       {...rest} // eslint-disable-line react/jsx-props-no-spreading
     />

package/src/shared/components/Modal/index.tsx

@@ -17,10 +17,14 @@ import S from './styles.scss';
 type PropsT = {
   cancelOnScrolling?: boolean;
   children?: ReactNode;
-  containerStyle?: React.CSSProperties;
   dontDisableScrolling?: boolean;
   onCancel?: () => void;
+  style?: React.CSSProperties;
+  testId?: string;
   theme: Theme<'container' | 'overlay'>;
+
+  /** @deprecated */
+  containerStyle?: React.CSSProperties;
 };
 
 /**
@@ -40,6 +44,8 @@ const BaseModal: React.FunctionComponent<PropsT> = ({
   containerStyle,
   dontDisableScrolling,
   onCancel,
+  style,
+  testId,
   theme,
 }) => {
   const containerRef = useRef<HTMLDivElement | null>(null);
@@ -141,11 +147,12 @@ const BaseModal: React.FunctionComponent<PropsT> = ({
         <div
           aria-modal="true"
           className={theme.container}
+          data-testid={testId}
           onClick={(e) => e.stopPropagation()}
           onWheel={(event) => event.stopPropagation()}
           ref={containerRef}
           role="dialog"
-          style={containerStyle}
+          style={style ?? containerStyle}
         >
           {children}
         </div>

package/src/shared/components/Throbber/theme.scss

@@ -1,3 +1,8 @@
+@keyframes bouncing {
+  from { top: -0.3em; }
+  to { top: 0.3em; }
+}
+
 *,
 .context,
 .ad.hoc {
@@ -6,11 +11,6 @@
   }
 
   &.circle {
-    @keyframes bouncing {
-      from { top: -0.3em; }
-      to { top: 0.3em; }
-    }
-
     animation: bouncing 0.4s ease-in infinite alternate;
     background: black;
     border-radius: 0.3em;

package/src/shared/components/selectors/NativeDropdown/index.tsx

@@ -30,6 +30,7 @@ const Dropdown: React.FunctionComponent<PropsT<string>> = ({
   label,
   onChange,
   options,
+  testId,
   theme,
   value,
 }) => {
@@ -75,6 +76,7 @@ const Dropdown: React.FunctionComponent<PropsT<string>> = ({
       <div className={theme.dropdown}>
         <select
           className={selectClassName}
+          data-testid={testId}
           onChange={onChange}
           value={value}
         >

package/src/shared/components/selectors/common.ts

@@ -38,6 +38,7 @@ export type PropsT<
   label?: React.ReactNode;
   onChange?: OnChangeT;
   options?: Readonly<OptionsT<NameT>>;
+  testId?: string;
   theme: Theme<ThemeKeyT>;
   value?: ValueT;
 };

package/src/shared/utils/jest/index.tsx

@@ -1,6 +1,12 @@
 /* global jest, document */
 /* eslint-disable import/no-extraneous-dependencies */
 
+import type {
+  AxiosRequestConfig,
+  AxiosResponse,
+  InternalAxiosRequestConfig,
+} from 'axios';
+
 import mockdate from 'mockdate';
 import { type ReactNode, act } from 'react';
 import { type Root, createRoot } from 'react-dom/client';
@@ -53,6 +59,43 @@ export function getMockUuid(seed = 0) {
   return `${x.slice(0, 8)}-${x.slice(8, 12)}-${x.slice(12, 16)}-${x.slice(16, 20)}-${x.slice(20)}`;
 }
 
+export type AxiosRequestHandlerT =
+  (config: AxiosRequestConfig) => Partial<AxiosResponse> | null | undefined;
+
+export function mockAxios(handlers: AxiosRequestHandlerT[]) {
+  const axios = jest.requireActual('axios');
+
+  axios.defaults.adapter = async (config: AxiosRequestConfig): Promise<AxiosResponse> => {
+    for (let i = 0; i < handlers.length; ++i) {
+      const res = handlers[i]?.(config);
+      if (res) {
+        return {
+          config: config as InternalAxiosRequestConfig,
+          data: null,
+          headers: {},
+          status: 200,
+          statusText: 'OK',
+          ...res,
+        };
+      }
+    }
+
+    // Fallback to the regular network request.
+    const res = await axios({ ...config, adapter: ['xhr', 'http', 'fetch'] });
+
+    console.warn(
+      'Network request has not been mocked for a test.\n\nConfig:\n',
+      config,
+      '\n\nResult:\n',
+      JSON.stringify(res, null, 2),
+    );
+
+    return res;
+  };
+
+  return axios;
+}
+
 /**
  * Advances mock timers, and mock date by the specified time.
  * @param {number} time Time step [ms].
@@ -66,6 +109,7 @@ export async function mockTimer(time: number) {
 
 export type MountedSceneT = HTMLElement & {
   destroy: () => void;
+  snapshot: () => void;
 };
 
 /**
@@ -89,6 +133,10 @@ export function mount(scene: ReactNode): MountedSceneT {
     res.remove();
   };
 
+  res.snapshot = () => {
+    expect(res).toMatchSnapshot();
+  };
+
   // NOTE: As it seems @testing-library may reset this flag to false
   // when it is simulating user events.
   global.IS_REACT_ACT_ENVIRONMENT = true;