@omnia/velcron 8.0.173-dev → 8.0.174-dev
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.
|
@@ -67,7 +67,9 @@ export interface VelcronRenderContext {
|
|
|
67
67
|
$editmode?: boolean;
|
|
68
68
|
$active?: boolean;
|
|
69
69
|
disposers: Array<() => void>;
|
|
70
|
+
baseDefinition?: VelcronAppDefinition;
|
|
70
71
|
subApp?: boolean;
|
|
72
|
+
subAppreferenceId?: GuidValue;
|
|
71
73
|
}
|
|
72
74
|
export interface VelcronRenderContextEventHandlers {
|
|
73
75
|
receiving?: {
|
|
@@ -156,6 +158,8 @@ export interface VelcronFlexDefinition extends VelcronDefinition, VelcronColorSt
|
|
|
156
158
|
border?: VelcronBorder;
|
|
157
159
|
borderRadius?: VelcronDimensions;
|
|
158
160
|
}
|
|
161
|
+
export interface VelcronEffects {
|
|
162
|
+
}
|
|
159
163
|
export interface VelcronFlexRowDefinition extends VelcronDefinition, VelcronColorStyling {
|
|
160
164
|
type: "row";
|
|
161
165
|
events?: VelcronOnPressEvent;
|
|
@@ -174,6 +178,7 @@ export interface VelcronFlexRowDefinition extends VelcronDefinition, VelcronColo
|
|
|
174
178
|
minWidth?: number | string;
|
|
175
179
|
height?: number | string;
|
|
176
180
|
minHeight?: number | string;
|
|
181
|
+
effects?: VelcronEffects;
|
|
177
182
|
}
|
|
178
183
|
export interface VelcronFlexColumnDefinition extends VelcronDefinition, VelcronColorStyling {
|
|
179
184
|
type: "column";
|
package/package.json
CHANGED
package/parser/VelcronData.js
CHANGED
|
@@ -451,7 +451,7 @@ class VelcronData {
|
|
|
451
451
|
return typeof value === "boolean" ? true : false;
|
|
452
452
|
}
|
|
453
453
|
static isNumber(value) {
|
|
454
|
-
return !isNaN(value);
|
|
454
|
+
return typeof value === "number" && !isNaN(value);
|
|
455
455
|
}
|
|
456
456
|
static isUndefined(value) {
|
|
457
457
|
return typeof value === "undefined";
|
|
@@ -94,7 +94,8 @@ class VelcronRenderers {
|
|
|
94
94
|
//blueprints: currentRenderCtx.blueprints,
|
|
95
95
|
disposers: currentRenderCtx.disposers,
|
|
96
96
|
properties: currentRenderCtx.properties,
|
|
97
|
-
|
|
97
|
+
baseDefinition: currentRenderCtx.baseDefinition,
|
|
98
|
+
subApp: currentRenderCtx.subApp
|
|
98
99
|
};
|
|
99
100
|
if (VelcronRenderers.definitionContainsCustomColorSchema(definition)) {
|
|
100
101
|
const colorSchemaType = __1.VelcronData.dataBind(currentRenderCtx, definition.colorSchemaType);
|
package/parser/VelcronStyles.js
CHANGED
|
@@ -13,7 +13,7 @@ class VelcronStyles {
|
|
|
13
13
|
if (!color) {
|
|
14
14
|
return;
|
|
15
15
|
}
|
|
16
|
-
if (color.filled) {
|
|
16
|
+
if (color.filled && !color?.blueprint) {
|
|
17
17
|
let colorValue = undefined;
|
|
18
18
|
if (color.colorType) {
|
|
19
19
|
//const schema = renderCtx.theming.get.colorSchema(VelcronData.dataBind(renderCtx, color.colorSchemaType) as ColorSchemaType);
|
|
@@ -138,11 +138,11 @@ class VelcronStyles {
|
|
|
138
138
|
if (textDefinition.colorType) {
|
|
139
139
|
const color = renderCtx.colors.get[textDefinition.colorType];
|
|
140
140
|
if (color) {
|
|
141
|
-
styleBase["color"] = textDefinition.toned ? color.colorToned : color.color;
|
|
141
|
+
styleBase["color"] = textDefinition.toned ? color.colorToned : color.color + "!important";
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
144
|
else {
|
|
145
|
-
styleBase["color"] = textDefinition.toned ? renderCtx.colors.get.onBase.colorToned : renderCtx.colors.get.onBase.color;
|
|
145
|
+
styleBase["color"] = textDefinition.toned ? renderCtx.colors.get.onBase.colorToned : renderCtx.colors.get.onBase.color + "!important";
|
|
146
146
|
}
|
|
147
147
|
if (textDefinition.noWrap) {
|
|
148
148
|
styleBase["textWrap"] = "nowrap";
|