Skip to content

Commit 90e141c

Browse files
committed
fix: fixing based on comments from designer
1 parent 1c21a9e commit 90e141c

File tree

7 files changed

+26
-14
lines changed

7 files changed

+26
-14
lines changed

packages/pluggableWidgets/events-web/src/Events.editorConfig.ts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import { Properties, hidePropertiesIn } from "@mendix/pluggable-widgets-tools";
2-
import { EventsPreviewProps } from "../typings/EventsProps";
32
import {
43
StructurePreviewProps,
54
structurePreviewPalette
65
} from "@mendix/widget-plugin-platform/preview/structure-preview-api";
6+
import { EventsPreviewProps } from "../typings/EventsProps";
77

8-
import EventsPreviewSVG from "./assets/Events.icon.svg";
98
import EventsPreviewSVGActive from "./assets/Events.icon.active.svg";
9+
import EventsPreviewSVG from "./assets/Events.icon.svg";
10+
import EventsPreviewDarkSVGActive from "./assets/Events.icon.dark.active.svg";
11+
import EventsPreviewDarkSVG from "./assets/Events.icon.dark.svg";
1012

1113
export function getProperties(
1214
values: EventsPreviewProps,
@@ -22,15 +24,16 @@ export function getPreview(values: EventsPreviewProps, isDarkMode: boolean): Str
2224
const eventsCount = Number(!!values.onComponentLoad) + Number(!!values.onEventChange);
2325

2426
const palette = structurePreviewPalette[isDarkMode ? "dark" : "light"];
25-
26-
const variant = eventsCount > 0 ? EventsPreviewSVGActive : EventsPreviewSVG;
27+
const activeSVG = isDarkMode ? EventsPreviewDarkSVGActive : EventsPreviewSVGActive;
28+
const normalSVG = isDarkMode ? EventsPreviewDarkSVG : EventsPreviewSVG;
29+
const variant = eventsCount > 0 ? activeSVG : normalSVG;
2730
const doc = decodeURIComponent(variant.replace("data:image/svg+xml,", ""));
2831

2932
return {
3033
type: "RowLayout",
3134
columnSize: "grow",
3235
borders: true,
33-
backgroundColor: eventsCount <= 0 ? palette.background.container : palette.background.containerDisabled,
36+
backgroundColor: palette.background.containerFill,
3437
children: [
3538
{
3639
type: "Container"
@@ -49,7 +52,10 @@ export function getPreview(values: EventsPreviewProps, isDarkMode: boolean): Str
4952
},
5053
{
5154
type: "Text",
52-
content: eventsCount <= 0 ? "[Configure events]" : `[${eventsCount}] Events`,
55+
content:
56+
eventsCount <= 0
57+
? "[Configure events]"
58+
: `[${eventsCount}] Event${eventsCount > 1 ? "s" : ""}`,
5359
fontColor: palette.text.primary,
5460
grow: 10
5561
}
@@ -65,5 +71,5 @@ export function getPreview(values: EventsPreviewProps, isDarkMode: boolean): Str
6571
export function getCustomCaption(values: EventsPreviewProps, _platform = "desktop"): string {
6672
const eventsCount = Number(!!values.onComponentLoad) + Number(!!values.onEventChange);
6773

68-
return eventsCount <= 0 ? "[Configure events]" : `[${eventsCount}] Events`;
74+
return eventsCount <= 0 ? "[Configure events]" : `[${eventsCount}] Event${eventsCount > 1 ? "s" : ""}`;
6975
}

packages/pluggableWidgets/events-web/src/Events.editorPreview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export function preview(props: EventsPreviewProps): ReactElement {
1010
return (
1111
<div className={classNames("widget-events-preview", { active: eventsCount > 0 })}>
1212
<EventsIcon isActive={eventsCount > 0} />
13-
{eventsCount <= 0 ? "[Configure events]" : `[${eventsCount}] Events`}
13+
{eventsCount <= 0 ? "[Configure events]" : `[${eventsCount}] Event${eventsCount > 1 ? "s" : ""}`}
1414
</div>
1515
);
1616
}
Lines changed: 2 additions & 3 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 2 additions & 3 deletions
Loading

packages/shared/widget-plugin-platform/src/preview/structure-preview-api.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ const paletteDark = {
281281
topbarStandard: colorWithAlpha("#646464", 20),
282282
buttonInfo: "#579BF9",
283283
container: "#313131",
284+
containerFill: "#3E3E3E",
284285
containerDisabled: "#4F4F4F"
285286
}
286287
} as const;
@@ -296,6 +297,7 @@ const paletteLight = {
296297
topbarStandard: "#F7F7F7",
297298
buttonInfo: "#146FF4",
298299
container: "#FFFFFF",
300+
containerFill: "#F2F2F3",
299301
containerDisabled: "#C8C8C8"
300302
}
301303
} as const;

0 commit comments

Comments
 (0)