windmill-components 1.70.0 → 1.75.0

package/components/apps/components/display/AppDisplayComponent.svelte

@@ -7,25 +7,30 @@ export let id;
 export let componentInput;
 export let initializing = undefined;
 export let customCss = undefined;
+export let render;
 const requireHtmlApproval = getContext(IS_APP_PUBLIC_CONTEXT_KEY);
-const { app } = getContext('AppEditorContext');
+const { app } = getContext('AppViewerContext');
 let result = undefined;
 export const staticOutputs = ['result', 'loading'];
 </script>
 
-<RunnableWrapper flexWrap bind:componentInput {id} bind:initializing bind:result>
-	<div class={twMerge(
-		'w-full border-b px-2 text-xs p-1 font-semibold bg-gray-500 text-white rounded-t-sm',
-		$app.css?.['displaycomponent']?.['header']?.class,
-		customCss?.header?.class
-	)}>
+<RunnableWrapper {render} flexWrap {componentInput} {id} bind:initializing bind:result>
+	<div
+		class={twMerge(
+			'w-full border-b px-2 text-xs p-1 font-semibold bg-gray-500 text-white rounded-t-sm',
+			$app.css?.['displaycomponent']?.['header']?.class,
+			customCss?.header?.class
+		)}
+	>
 		Results
 	</div>
-	<div class={twMerge(
-		'p-2',
-		$app.css?.['displaycomponent']?.['container']?.class,
-		customCss?.container?.class
-	)}>
+	<div
+		class={twMerge(
+			'p-2',
+			$app.css?.['displaycomponent']?.['container']?.class,
+			customCss?.container?.class
+		)}
+	>
 		<DisplayResult {result} {requireHtmlApproval} />
 	</div>
 </RunnableWrapper>

package/components/apps/components/display/AppDisplayComponent.svelte.d.ts

@@ -7,6 +7,7 @@ declare const __propDef: {
         componentInput: AppInput | undefined;
         initializing?: boolean | undefined;
         customCss?: ComponentCustomCSS<'header' | 'container'> | undefined;
+        render: boolean;
         staticOutputs?: string[] | undefined;
     };
     events: {

package/components/apps/components/display/AppHtml.svelte

@@ -1,11 +1,17 @@
-<script>import RunnableWrapper from '../helpers/RunnableWrapper.svelte';
+<script>import { getContext } from 'svelte';
+import { concatCustomCss } from '../../utils';
+import RunnableWrapper from '../helpers/RunnableWrapper.svelte';
 export let id;
 export let componentInput;
 export let initializing = undefined;
+export let customCss = undefined;
+export let render;
 export const staticOutputs = ['result', 'loading'];
+const { app } = getContext('AppViewerContext');
 let result = undefined;
 let h = undefined;
 let w = undefined;
+$: css = concatCustomCss($app.css?.htmlcomponent, customCss);
 </script>
 
 <div
@@ -16,12 +22,20 @@ let w = undefined;
 	bind:clientHeight={h}
 	bind:clientWidth={w}
 >
-	<RunnableWrapper autoRefresh flexWrap bind:componentInput {id} bind:initializing bind:result>
+	<RunnableWrapper
+		{render}
+		autoRefresh
+		flexWrap
+		{componentInput}
+		{id}
+		bind:initializing
+		bind:result
+	>
 		{#key result}
 			<iframe
 				frameborder="0"
-				style="height: {h}px; width: {w}px"
-				class="p-0"
+				style="height: {h}px; width: {w}px; {css?.container?.style ?? ''}"
+				class="p-0 {css?.container?.class ?? ''}"
 				title="sandbox"
 				srcdoc={result
 					? '<scr' + `ipt type="application/javascript" src="/tailwind.js"></script>` + result

package/components/apps/components/display/AppHtml.svelte.d.ts

@@ -1,10 +1,13 @@
 import { SvelteComponentTyped } from "svelte";
 import type { AppInput } from '../../inputType';
+import type { ComponentCustomCSS } from '../../types';
 declare const __propDef: {
     props: {
         id: string;
         componentInput: AppInput | undefined;
         initializing?: boolean | undefined;
+        customCss?: ComponentCustomCSS<'container'> | undefined;
+        render: boolean;
         staticOutputs?: string[] | undefined;
     };
     events: {

package/components/apps/components/display/AppIcon.svelte

@@ -1,21 +1,25 @@
-<script>import { AlignWrapper, InputValue, RunnableWrapper } from '../helpers';
+<script>import { getContext } from 'svelte';
+import { concatCustomCss } from '../../utils';
+import { AlignWrapper, InputValue } from '../helpers';
 import { loadIcon } from '../icon';
 export let id;
 export let horizontalAlignment = 'left';
 export let verticalAlignment = undefined;
 export let configuration;
 export const staticOutputs = [];
+export let customCss = undefined;
+export let render;
+const { app } = getContext('AppViewerContext');
 let icon = undefined;
 let size;
 let color;
 let strokeWidth;
 let iconComponent;
-$: icon && handleIcon();
-async function handleIcon() {
-    if (icon) {
-        iconComponent = await loadIcon(icon);
-    }
+$: handleIcon(icon);
+async function handleIcon(i) {
+    iconComponent = i ? await loadIcon(i) : undefined;
 }
+$: css = concatCustomCss($app.css?.iconcomponent, customCss);
 </script>
 
 <InputValue {id} input={configuration.icon} bind:value={icon} />
@@ -23,13 +27,21 @@ async function handleIcon() {
 <InputValue {id} input={configuration.color} bind:value={color} />
 <InputValue {id} input={configuration.strokeWidth} bind:value={strokeWidth} />
 
-<AlignWrapper {horizontalAlignment} {verticalAlignment}>
-	{#if iconComponent}
+<AlignWrapper
+	{render}
+	{horizontalAlignment}
+	{verticalAlignment}
+	class={css?.container?.class ?? ''}
+	style={css?.container?.style ?? ''}
+>
+	{#if icon && iconComponent}
 		<svelte:component
 			this={iconComponent}
 			size={size || 24}
 			color={color || 'currentColor'}
 			strokeWidth={strokeWidth || 2}
+			class={css?.icon?.class ?? ''}
+			style={css?.icon?.style ?? ''}
 		/>
 	{/if}
 </AlignWrapper>

package/components/apps/components/display/AppIcon.svelte.d.ts

@@ -1,5 +1,6 @@
 import { SvelteComponentTyped } from "svelte";
 import type { AppInput } from '../../inputType';
+import type { ComponentCustomCSS } from '../../types';
 declare const __propDef: {
     props: {
         id: string;
@@ -7,6 +8,8 @@ declare const __propDef: {
         verticalAlignment?: 'top' | 'center' | 'bottom' | undefined;
         configuration: Record<string, AppInput>;
         staticOutputs?: string[] | undefined;
+        customCss?: ComponentCustomCSS<'container' | 'icon'> | undefined;
+        render: boolean;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/components/apps/components/display/AppImage.svelte

@@ -1,7 +1,13 @@
-<script>import InputValue from '../helpers/InputValue.svelte';
+<script>import { getContext } from 'svelte';
+import { twMerge } from 'tailwind-merge';
+import { concatCustomCss } from '../../utils';
+import InputValue from '../helpers/InputValue.svelte';
 export let id;
 export let configuration;
 export const staticOutputs = ['loading'];
+export let customCss = undefined;
+export let render;
+const { app } = getContext('AppViewerContext');
 const fit = {
     cover: 'object-cover',
     contain: 'object-contain',
@@ -10,18 +16,19 @@ const fit = {
 let source = undefined;
 let imageFit = undefined;
 let altText = undefined;
-let customStyles = undefined;
+$: css = concatCustomCss($app.css?.imagecomponent, customCss);
 </script>
 
 <InputValue {id} input={configuration.source} bind:value={source} />
 <InputValue {id} input={configuration.imageFit} bind:value={imageFit} />
 <InputValue {id} input={configuration.altText} bind:value={altText} />
-<InputValue {id} input={configuration.customStyles} bind:value={customStyles} />
 
-<img
-	on:pointerdown|preventDefault
-	src={source}
-	alt={altText}
-	style={customStyles}
-	class="w-full h-full {fit[imageFit || 'cover']}"
-/>
+{#if render}
+	<img
+		on:pointerdown|preventDefault
+		src={source}
+		alt={altText}
+		style={css?.image?.style ?? ''}
+		class={twMerge(`w-full h-full ${fit[imageFit || 'cover']}`, css?.image?.class ?? '')}
+	/>
+{/if}

package/components/apps/components/display/AppImage.svelte.d.ts

@@ -1,10 +1,13 @@
 import { SvelteComponentTyped } from "svelte";
 import type { AppInput } from '../../inputType';
+import type { ComponentCustomCSS } from '../../types';
 declare const __propDef: {
     props: {
         id: string;
         configuration: Record<string, AppInput>;
         staticOutputs?: string[] | undefined;
+        customCss?: ComponentCustomCSS<'image'> | undefined;
+        render: boolean;
     };
     events: {
         pointerdown: PointerEvent;

package/components/apps/components/display/AppMap.svelte

@@ -0,0 +1,214 @@
+<script>import { getContext, onMount } from 'svelte';
+import { concatCustomCss } from '../../utils';
+import { InputValue } from '../helpers';
+import { twMerge } from 'tailwind-merge';
+import { Map, View, Feature } from 'ol';
+import { useGeographic } from 'ol/proj';
+import { OSM, Vector as VectorSource } from 'ol/source';
+import { Vector as VectorLayer, Tile as TileLayer } from 'ol/layer';
+import { Point } from 'ol/geom';
+import { defaults as defaultControls } from 'ol/control';
+import { findGridItem } from '../../editor/appUtils';
+const LAYER_NAME = {
+    MARKER: 'Marker'
+};
+export let id;
+export let configuration;
+export const staticOutputs = ['mapRegion'];
+export let customCss = undefined;
+export let render;
+const { app, worldStore, selectedComponent, connectingInput, focusedGrid, mode } = getContext('AppViewerContext');
+$: outputs = $worldStore?.outputsById[id];
+let map;
+let mapElement;
+let longitude = undefined;
+let latitude = undefined;
+let zoom = undefined;
+// If string, it's a JSON file read as text
+let markers = undefined;
+$: if (map && longitude && latitude) {
+    map.getView().setCenter([longitude, latitude]);
+}
+$: if (map && zoom) {
+    map.getView().setZoom(zoom);
+}
+$: if (map && markers) {
+    updateMarkers();
+}
+function selectComponent() {
+    if (!$connectingInput.opened) {
+        $selectedComponent = id;
+        $focusedGrid = undefined;
+    }
+}
+function getLayersByName(name) {
+    return map
+        .getLayers()
+        .getArray()
+        .filter((l) => l.getProperties().name === LAYER_NAME[name]);
+}
+function getMarkerArray() {
+    let array = undefined;
+    if (typeof markers === 'string') {
+        try {
+            array = JSON.parse(markers);
+        }
+        catch (e) {
+            return undefined;
+        }
+    }
+    else {
+        array = markers;
+    }
+    return array?.filter((m) => !isNaN(+m.lat) && !isNaN(+m.lon));
+}
+function createMarkerLayers() {
+    const markerArray = getMarkerArray();
+    return markerArray?.map((m) => {
+        return new VectorLayer({
+            properties: {
+                name: LAYER_NAME.MARKER
+            },
+            source: new VectorSource({
+                features: [
+                    new Feature({
+                        geometry: new Point([+m.lon, +m.lat]),
+                        name: m.title
+                    })
+                ]
+            }),
+            style: {
+                'circle-radius': m.radius ?? 7,
+                'circle-fill-color': m.color ?? '#dc2626',
+                'circle-stroke-width': m.strokeWidth ?? 3,
+                'circle-stroke-color': m.strokeColor ?? '#fca5a5'
+            }
+        });
+    });
+}
+function updateMarkers() {
+    const layers = getLayersByName('MARKER');
+    if (layers?.length) {
+        layers.forEach((l) => map.removeLayer(l));
+    }
+    createMarkerLayers()?.forEach((l) => map.addLayer(l));
+}
+onMount(() => {
+    useGeographic();
+    map = new Map({
+        target: mapElement,
+        layers: [
+            new TileLayer({
+                source: new OSM()
+            }),
+            ...(createMarkerLayers() || [])
+        ],
+        view: new View({
+            center: [longitude ?? 0, latitude ?? 0],
+            zoom: zoom ?? 2
+        }),
+        controls: defaultControls({
+            attribution: false
+        })
+    });
+    updateRegionOutput();
+});
+$: css = concatCustomCss($app.css?.mapcomponent, customCss);
+function updateRegionOutput() {
+    if (map) {
+        let extent = map.getView().calculateExtent(map.getSize());
+        const [left, bottom, right, top] = extent;
+        if (outputs?.mapRegion) {
+            outputs.mapRegion.set({
+                topLeft: { lat: top, lon: left },
+                bottomRight: { lat: bottom, lon: right }
+            });
+        }
+    }
+}
+function handleSyncRegion() {
+    const gridItem = findGridItem($app, id);
+    if (!map || !gridItem) {
+        return;
+    }
+    const z = map.getView().getZoom();
+    updateRegionOutput();
+    if (z) {
+        gridItem.data.configuration.zoom.value = z;
+    }
+    const center = map.getView().getCenter();
+    if (!center) {
+        return;
+    }
+    if (gridItem) {
+        gridItem.data.configuration.longitude.value = center[0];
+        gridItem.data.configuration.latitude.value = center[1];
+    }
+}
+</script>
+
+<InputValue {id} input={configuration.longitude} bind:value={longitude} />
+<InputValue {id} input={configuration.latitude} bind:value={latitude} />
+<InputValue {id} input={configuration.zoom} bind:value={zoom} />
+<InputValue {id} input={configuration.markers} bind:value={markers} />
+
+{#if render}
+	<div class="relative h-full w-full">
+		<div
+			on:pointerdown|stopPropagation={selectComponent}
+			bind:this={mapElement}
+			class={twMerge(`w-full h-full`, css?.map?.class ?? '')}
+			style={css?.map?.style ?? ''}
+		/>
+
+		{#if $mode !== 'preview'}
+			<div
+				class="absolute bottom-0 left-0 px-1 py-0.5 bg-indigo-500 text-white text-2xs"
+				on:pointerdown={handleSyncRegion}
+			>
+				Set region
+			</div>
+		{/if}
+	</div>
+{/if}
+
+<style global>
+	:global(.ol-overlaycontainer-stopevent) {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    justify-content: flex-start
+}
+	:global(.ol-control) :global(button) {
+    margin-top: 0.25rem;
+    margin-right: 0.25rem;
+    height: 1.75rem;
+    width: 1.75rem;
+    border-radius: 0.25rem;
+    border-width: 1px;
+    --tw-border-opacity: 1;
+    border-color: rgb(209 213 219 / var(--tw-border-opacity));
+    --tw-bg-opacity: 1;
+    background-color: rgb(255 255 255 / var(--tw-bg-opacity));
+    --tw-text-opacity: 1;
+    color: rgb(55 65 81 / var(--tw-text-opacity));
+    --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
+    --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);
+    box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
+    transition-duration: 200ms;
+    display: flex;
+    justify-content: center;
+    align-items: center
+}
+	:global(.ol-control) :global(button:hover) {
+    --tw-border-opacity: 1;
+    border-color: rgb(107 114 128 / var(--tw-border-opacity));
+    --tw-bg-opacity: 1;
+    background-color: rgb(243 244 246 / var(--tw-bg-opacity))
+}
+	:global(.ol-control) :global(button:focus) {
+    --tw-border-opacity: 1;
+    border-color: rgb(107 114 128 / var(--tw-border-opacity));
+    --tw-bg-opacity: 1;
+    background-color: rgb(243 244 246 / var(--tw-bg-opacity))
+}</style>

package/components/apps/components/display/AppMap.svelte.d.ts

@@ -0,0 +1,23 @@
+import { SvelteComponentTyped } from "svelte";
+import type { AppInput } from '../../inputType';
+import type { ComponentCustomCSS } from '../../types';
+declare const __propDef: {
+    props: {
+        id: string;
+        configuration: Record<string, AppInput>;
+        staticOutputs?: string[] | undefined;
+        customCss?: ComponentCustomCSS<'map'> | undefined;
+        render: boolean;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type AppMapProps = typeof __propDef.props;
+export type AppMapEvents = typeof __propDef.events;
+export type AppMapSlots = typeof __propDef.slots;
+export default class AppMap extends SvelteComponentTyped<AppMapProps, AppMapEvents, AppMapSlots> {
+    get staticOutputs(): string[];
+}
+export {};