ingred-ui 33.1.1 → 33.2.1

package/dist/components/AdvancedFilter/index.d.ts

@@ -32,4 +32,4 @@ export type { ValueDefinition } from "./utils/values";
 export { isRangeOperator, isCustomOperator, isValidFilterConfig, isValidFilterType, generateTagText, generateTagTitle, getTagBoldText, getAvailableTypes, getFilterTypeLabel, buildFilterSlots, getPresetSlotId, isConfiguredFilter, getConfiguredFilters, } from "./utils/helpers";
 export { FilterPositionCalculator } from "./utils/positionCalculator";
 export { ADVANCED_FILTER_CONSTANTS } from "./constants";
-export type { AdvancedFilterProps, FilterType, FilterTypeConfig, FilterConfig, AppliedFilter, OperatorDefinition, AdvancedFilterSize, AdvancedFilterVariant, FilterOperator, FilterInputType, FilterPresetType, AdvancedFilterSelectionMode, FilterSlotView, } from "./types";
+export type { AdvancedFilterProps, FilterType, FilterTypeConfig, FilterConfig, AppliedFilter, OperatorDefinition, AdvancedFilterSize, AdvancedFilterVariant, FilterOperator, FilterInputType, FilterPresetType, AdvancedFilterSelectionMode, FilterSlotView, MultiConditionLogic, } from "./types";

package/dist/components/AdvancedFilter/internal/MultiConditionLogicDivider.d.ts

@@ -0,0 +1,11 @@
+/**
+ * MultiConditionLogicDivider - 複数条件フィルタの条件間区切り
+ *
+ * 条件と条件の間に AND / OR バッジと水平線を表示する。
+ */
+import React from "react";
+import { MultiConditionLogic } from "../types";
+export type MultiConditionLogicDividerProps = {
+    logic: MultiConditionLogic;
+};
+export declare const MultiConditionLogicDivider: React.FC<MultiConditionLogicDividerProps>;

package/dist/components/AdvancedFilter/styled.d.ts

@@ -143,6 +143,16 @@ export declare const FilterTypeName: import("styled-components/dist/types").ISty
  * コンテンツエリア
  */
 export declare const Content: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never> & Partial<Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>>> & string;
+/**
+ * 複数条件フィルタの条件見出し
+ */
+export declare const MultiConditionHeader: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never> & Partial<Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>>> & string;
+export declare const MultiConditionHeaderLabel: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, never> & Partial<Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, never>>> & string;
+/**
+ * 複数条件フィルタの条件間区切り（AND / OR バッジ + 水平線）
+ */
+export declare const MultiConditionLogicDividerContainer: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never> & Partial<Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>>> & string;
+export declare const MultiConditionLogicDividerLine: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLHRElement>, HTMLHRElement>, never> & Partial<Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLHRElement>, HTMLHRElement>, never>>> & string;
 /**
  * セクション
  */

package/dist/components/AdvancedFilter/types.d.ts

@@ -53,6 +53,8 @@ export type ValueDefinition = {
     value: string | boolean;
     label: string;
 };
+/** 複数条件フィルタ内の条件結合ロジック */
+export type MultiConditionLogic = "and" | "or";
 /**
  * 1つのフィルタタイプで複数のフィルタリング条件を設定するための設定定義
  * 例: 複合フィルタで「性別」と「年齢」の2つの条件を設定
@@ -112,6 +114,13 @@ export type FilterTypeConfig = {
     };
     /** このフィルタタイプで設定可能な複数条件の設定（複数条件フィルタ用） */
     multiConditionConfigs?: MultiFilterConditionConfig[];
+    /**
+     * 複数条件フィルタ内の条件結合ロジック（区切り線バッジの表示用）
+     * - "and" または未指定: AND（デフォルト）
+     * - "or": OR
+     * 注: 現時点のフィルタ評価は AND 固定。OR は表示のみ対応。
+     */
+    multiConditionLogic?: MultiConditionLogic;
     /** 日付の表示フォーマット（dayjs形式）。指定時は Tag と DatePicker で同一フォーマット。未指定は YYYY-MM-DD */
     dateFormat?: string;
 };

package/dist/components/AdvancedFilter/utils/helpers.d.ts

@@ -11,7 +11,7 @@
  * - タグ表示: タグのテキスト・タイトル生成
  * - バリデーション: フィルター設定・タイプの有効性チェック
  */
-import { AppliedFilter, FilterConfig, FilterInputType, FilterSlotView, FilterTypeConfig, MultiFilterConditionConfig, OperatorDefinition, ValueDefinition } from "../types";
+import { AppliedFilter, FilterConfig, FilterInputType, FilterSlotView, FilterTypeConfig, MultiConditionLogic, MultiFilterConditionConfig, OperatorDefinition, ValueDefinition } from "../types";
 /**
  * 範囲指定が必要なオペレーターかどうかを判定
  * @param operator オペレーターのvalue
@@ -121,6 +121,10 @@ export declare const hasMultiConditions: (filterConfig?: FilterTypeConfig) => bo
  * 複数条件設定を取得する
  */
 export declare const getMultiConditionConfigs: (filterConfig?: FilterTypeConfig) => MultiFilterConditionConfig[];
+/**
+ * 複数条件フィルタ内の条件結合ロジックを取得する
+ */
+export declare const getMultiConditionLogic: (filterConfig?: FilterTypeConfig) => MultiConditionLogic;
 /**
  * 条件キーから条件設定を取得する
  */

package/dist/components/DataTable2/styled.d.ts

@@ -90,7 +90,7 @@ export declare const DataTable2ColumnInner: import("styled-components/dist/types
 export declare const DragHandle: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, never> & Partial<Pick<React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, never>>> & string;
 export declare const DragArea: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never> & Partial<Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>>> & string;
 export declare const DataTable2ColumnLabel: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never> & Partial<Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>>> & string;
-export declare const SortButton: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, never> & Partial<Pick<React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, never>>> & string;
+export declare const SortableColumnLabel: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, never> & Partial<Pick<React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, never>>> & string;
 export declare const DataTable2Row: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<import("styled-components").FastOmit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLTableRowElement>, HTMLTableRowElement>, "isSmallLayout"> & {
     isSmallLayout: boolean;
 }, never> & Partial<Pick<import("styled-components").FastOmit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLTableRowElement>, HTMLTableRowElement>, "isSmallLayout"> & {

package/dist/components/DataTable2/utils/toolbarUtils.d.ts

@@ -1,6 +1,8 @@
 import React from "react";
 import type { Theme } from "../../../themes/createTheme";
 import type { TableAction } from "../types/tableActions";
+/** ページング表示用。4桁以上（1000以上）のとき千の位区切りにカンマを入れる。 */
+export declare const formatPaginationCount: (count: number) => string;
 /**
  * アイコンの色を動的に変更するヘルパー関数
  *