@true-engineering/true-react-common-ui-kit 3.53.1 → 3.55.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -0
- package/dist/components/Button/Button.styles.d.ts +1 -1
- package/dist/components/Checkbox/Checkbox.styles.d.ts +1 -1
- package/dist/components/FiltersPane/components/FilterInterval/FilterInterval.styles.d.ts +1 -1
- package/dist/components/FiltersPane/components/FilterSelect/FilterSelect.styles.d.ts +1 -1
- package/dist/components/FiltersPane/components/FilterWithDates/FilterWithDates.styles.d.ts +2 -2
- package/dist/components/List/List.d.ts +1 -1
- package/dist/components/List/index.d.ts +2 -1
- package/dist/components/List/types.d.ts +4 -0
- package/dist/components/Select/index.d.ts +1 -1
- package/dist/hooks/index.d.ts +1 -0
- package/dist/hooks/use-merge.d.ts +1 -0
- package/dist/hooks/use-mixed-styles.d.ts +3 -1
- package/dist/hooks/use-tweak-styles.d.ts +5 -5
- package/dist/theme/Provider.d.ts +6 -3
- package/dist/theme/create-themed-styles.d.ts +2 -0
- package/dist/theme/helpers.d.ts +9 -3
- package/dist/theme/index.d.ts +2 -0
- package/dist/theme/true-jss/ThemedStylesManager.d.ts +18 -0
- package/dist/theme/true-jss/TweakStylesManager.d.ts +34 -0
- package/dist/theme/true-jss/index.d.ts +2 -0
- package/dist/theme/true-jss/jss-context.d.ts +9 -0
- package/dist/theme/types.d.ts +4 -2
- package/dist/true-react-common-ui-kit.js +3388 -2512
- package/dist/true-react-common-ui-kit.js.map +1 -1
- package/dist/true-react-common-ui-kit.umd.cjs +3380 -2505
- package/dist/true-react-common-ui-kit.umd.cjs.map +1 -1
- package/dist/types.d.ts +2 -1
- package/package.json +1 -1
- package/src/components/List/List.tsx +5 -2
- package/src/components/List/index.ts +2 -1
- package/src/components/List/types.ts +5 -0
- package/src/components/Select/index.ts +1 -1
- package/src/hooks/index.ts +1 -0
- package/src/hooks/use-merge.ts +8 -0
- package/src/hooks/use-mixed-styles.ts +9 -11
- package/src/hooks/use-tweak-styles.ts +49 -27
- package/src/theme/Provider.tsx +10 -5
- package/src/theme/create-themed-styles.ts +78 -0
- package/src/theme/helpers.ts +39 -39
- package/src/theme/index.ts +2 -0
- package/src/theme/true-jss/ThemedStylesManager.ts +92 -0
- package/src/theme/true-jss/TweakStylesManager.ts +157 -0
- package/src/theme/true-jss/index.ts +2 -0
- package/src/theme/true-jss/jss-context.tsx +34 -0
- package/src/theme/types.ts +4 -2
- package/src/types.ts +2 -1
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
import type { StyleSheet, Classes, Rule } from 'jss';
|
|
2
|
+
import {
|
|
3
|
+
isArrayNotEmpty,
|
|
4
|
+
isNotEmpty,
|
|
5
|
+
joinStrings,
|
|
6
|
+
mergeStyles,
|
|
7
|
+
} from '@true-engineering/true-react-platform-helpers';
|
|
8
|
+
import { isTweakStyle } from '../helpers';
|
|
9
|
+
|
|
10
|
+
export type IPartialStyle = object;
|
|
11
|
+
|
|
12
|
+
interface TweakRules<C extends string> {
|
|
13
|
+
classes: Classes<C>;
|
|
14
|
+
refs?: number;
|
|
15
|
+
rules: Map<C, Rule>;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
interface TweakStylesManagerOptions<C extends string> {
|
|
19
|
+
sheet: StyleSheet<C>;
|
|
20
|
+
classes: Classes<C>;
|
|
21
|
+
tweak?: IPartialStyle[];
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export class TweakStylesManager<C extends string> {
|
|
25
|
+
#map = new WeakMap<IPartialStyle, TweakStylesManager<C>>();
|
|
26
|
+
#sheet: StyleSheet<C>;
|
|
27
|
+
#classes: Classes<C>;
|
|
28
|
+
#tweak: IPartialStyle[];
|
|
29
|
+
|
|
30
|
+
#tweakRules: TweakRules<C> | undefined;
|
|
31
|
+
constructor({ sheet, classes, tweak = [] }: TweakStylesManagerOptions<C>) {
|
|
32
|
+
this.#sheet = sheet;
|
|
33
|
+
this.#classes = classes;
|
|
34
|
+
this.#tweak = tweak;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
public getClasses([next, ...rest]: IPartialStyle[]): Classes<C> {
|
|
38
|
+
const nextManager = this.getNextManager(next);
|
|
39
|
+
if (isNotEmpty(nextManager)) {
|
|
40
|
+
return nextManager.getClasses(rest);
|
|
41
|
+
}
|
|
42
|
+
return this.getOrCreate()?.classes ?? this.#classes;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
public manage([next, ...rest]: IPartialStyle[]): void {
|
|
46
|
+
const nextManager = this.getNextManager(next);
|
|
47
|
+
if (isNotEmpty(nextManager)) {
|
|
48
|
+
return nextManager.manage(rest);
|
|
49
|
+
}
|
|
50
|
+
if (!isNotEmpty(this.#tweakRules)) {
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
if (this.#tweakRules.refs === 0) {
|
|
54
|
+
this.insertRules();
|
|
55
|
+
}
|
|
56
|
+
this.#tweakRules.refs = (this.#tweakRules.refs ?? 0) + 1;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
public unmanage([next, ...rest]: IPartialStyle[]): void {
|
|
60
|
+
const nextManager = this.getNextManager(next);
|
|
61
|
+
if (isNotEmpty(nextManager)) {
|
|
62
|
+
return nextManager.unmanage(rest);
|
|
63
|
+
}
|
|
64
|
+
if (!isNotEmpty(this.#tweakRules) || this.#tweakRules.refs === 0) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
this.#tweakRules.refs = (this.#tweakRules.refs ?? 1) - 1;
|
|
68
|
+
if (this.#tweakRules.refs === 0) {
|
|
69
|
+
this.deleteRules();
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
private getNextManager(next?: IPartialStyle) {
|
|
74
|
+
if (!isNotEmpty(next)) {
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
if (!this.#map.has(next)) {
|
|
78
|
+
const manager = new TweakStylesManager({
|
|
79
|
+
sheet: this.#sheet,
|
|
80
|
+
classes: this.#classes,
|
|
81
|
+
tweak: this.#tweak.concat(next),
|
|
82
|
+
});
|
|
83
|
+
this.#map.set(next, manager);
|
|
84
|
+
}
|
|
85
|
+
return this.#map.get(next);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
private getOrCreate() {
|
|
89
|
+
if (!isNotEmpty(this.#tweakRules) && isArrayNotEmpty(this.#tweak)) {
|
|
90
|
+
const [first, ...rest] = this.#tweak;
|
|
91
|
+
const styles = isArrayNotEmpty(rest) ? mergeStyles(first, ...rest) : first;
|
|
92
|
+
|
|
93
|
+
const rules = this.addRules(styles);
|
|
94
|
+
|
|
95
|
+
const classes = { ...this.#classes };
|
|
96
|
+
rules.forEach((rule, key) => {
|
|
97
|
+
classes[key] = joinStrings([classes[key], rule.id], ' ');
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
this.#tweakRules = { classes, rules };
|
|
101
|
+
}
|
|
102
|
+
return this.#tweakRules;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
private addRules(styles: IPartialStyle) {
|
|
106
|
+
return new Map(
|
|
107
|
+
Object.entries(styles)
|
|
108
|
+
.map(([key, style]) => this.addRule(key as C, style))
|
|
109
|
+
.filter(isNotEmpty),
|
|
110
|
+
);
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
private addRule(key: C, style: object) {
|
|
114
|
+
if (isTweakStyle(key)) {
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
const rule = this.#sheet.addRule(key, style, { index: this.getInsertIndex(key) });
|
|
118
|
+
return isNotEmpty(rule) ? ([key, rule] as const) : undefined;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
private insertRules() {
|
|
122
|
+
this.#tweakRules?.rules.forEach((rule, key) => {
|
|
123
|
+
this.#sheet.rules.register(rule);
|
|
124
|
+
this.#sheet.rules.index.splice(this.getInsertIndex(key), 0, rule);
|
|
125
|
+
this.#sheet.insertRule(rule);
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
private deleteRules() {
|
|
130
|
+
this.#tweakRules?.rules.forEach((rule) => this.#sheet.deleteRule(rule));
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
private getInsertIndex(key: C) {
|
|
134
|
+
return (
|
|
135
|
+
this.#sheet.rules.index.findIndex((rule) => rule.key === key) + 1 ||
|
|
136
|
+
this.#sheet.rules.index.length
|
|
137
|
+
);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
declare module 'jss' {
|
|
142
|
+
export interface RuleList {
|
|
143
|
+
index: Rule[];
|
|
144
|
+
}
|
|
145
|
+
// eslint-disable-next-line no-shadow
|
|
146
|
+
export interface StyleSheet<RuleName> {
|
|
147
|
+
rules: RuleList;
|
|
148
|
+
// eslint-disable-next-line @typescript-eslint/method-signature-style
|
|
149
|
+
deleteRule(rule: Rule): boolean;
|
|
150
|
+
// eslint-disable-next-line @typescript-eslint/method-signature-style
|
|
151
|
+
addRule(
|
|
152
|
+
name: RuleName,
|
|
153
|
+
style: JssStyle,
|
|
154
|
+
options?: Partial<Rule['options']>,
|
|
155
|
+
): (Rule & { id: string }) | null;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { Context, FC, PropsWithChildren, useContext, useMemo } from 'react';
|
|
2
|
+
import { JssContext as JssContextLib } from 'react-jss';
|
|
3
|
+
import { GenerateId } from 'jss';
|
|
4
|
+
|
|
5
|
+
export interface IJssContext {
|
|
6
|
+
generateId?: GenerateId;
|
|
7
|
+
tweakStylesArch?: 'react-jss' | 'true-jss';
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
/** Типизация JssContext оказалась некорректна */
|
|
11
|
+
export const JssContext = JssContextLib as unknown as Context<IJssContext>;
|
|
12
|
+
|
|
13
|
+
export const JssProvider: FC<PropsWithChildren<IJssContext>> = ({
|
|
14
|
+
children,
|
|
15
|
+
tweakStylesArch,
|
|
16
|
+
generateId,
|
|
17
|
+
}) => {
|
|
18
|
+
const context = useContext(JssContext);
|
|
19
|
+
|
|
20
|
+
const value: IJssContext = useMemo(
|
|
21
|
+
() => ({
|
|
22
|
+
...context,
|
|
23
|
+
tweakStylesArch: tweakStylesArch ?? context.tweakStylesArch,
|
|
24
|
+
generateId: generateId ?? context.generateId,
|
|
25
|
+
}),
|
|
26
|
+
[context, tweakStylesArch, generateId],
|
|
27
|
+
);
|
|
28
|
+
|
|
29
|
+
return (
|
|
30
|
+
<JssContext.Provider key={tweakStylesArch} value={value}>
|
|
31
|
+
{children}
|
|
32
|
+
</JssContext.Provider>
|
|
33
|
+
);
|
|
34
|
+
};
|
package/src/theme/types.ts
CHANGED
|
@@ -65,10 +65,12 @@ import type {
|
|
|
65
65
|
IWithTooltipStyles,
|
|
66
66
|
} from '../components';
|
|
67
67
|
|
|
68
|
-
export type IStyles<C extends string, P> = Styles<C, P, Partial<Styles<C, P>>>;
|
|
68
|
+
export type IStyles<C extends string, P = unknown> = Styles<C, P, Partial<Styles<C, P>>>;
|
|
69
69
|
|
|
70
|
+
export type IMaybeArray<T> = T[] | T;
|
|
71
|
+
export type IMixedStyles<T> = IMaybeArray<T | boolean | undefined>;
|
|
70
72
|
export type IUseStyles<C extends string, P = unknown> = (
|
|
71
|
-
data?: P & { theme?: Partial<Styles<C, P
|
|
73
|
+
data?: P & { theme?: IMaybeArray<Partial<Styles<C, P>>> },
|
|
72
74
|
) => Classes<C>;
|
|
73
75
|
|
|
74
76
|
export type ITweakStyles<
|
package/src/types.ts
CHANGED
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
ReactNode,
|
|
7
7
|
} from 'react';
|
|
8
8
|
import { Modifier, Placement } from 'react-overlays/usePopper';
|
|
9
|
+
import type { IMaybeArray } from './theme';
|
|
9
10
|
|
|
10
11
|
export interface ITestIdProps {
|
|
11
12
|
testId?: string;
|
|
@@ -20,7 +21,7 @@ export interface IDataAttributesProps extends ITestIdProps {
|
|
|
20
21
|
}
|
|
21
22
|
|
|
22
23
|
export interface ITweakStylesProps<TweakStyles> {
|
|
23
|
-
tweakStyles?: TweakStyles
|
|
24
|
+
tweakStyles?: IMaybeArray<TweakStyles>;
|
|
24
25
|
}
|
|
25
26
|
|
|
26
27
|
export type ICommonProps<TweakStyles> = IDataAttributesProps & ITweakStylesProps<TweakStyles>;
|