From 183361df85e5efbcea4a53bddc3e641cbf73acd2 Mon Sep 17 00:00:00 2001
From: Faton Ramadani <faton.ramadani14@gmail.com>
Date: Mon, 24 Jun 2024 13:20:35 +0200
Subject: [PATCH] fix(frontend): improve disable style of the select component
 (#3938)

* feat(frontend): improve disable style of the select component

* fix(frontend): improve inputs style

* fix(frontend): fix build

* fix(frontend): revert unnecessary changes
---
 frontend/src/lib/assets/app.css               |  4 +-
 .../src/lib/components/DateTimeInput.svelte   | 15 +++++-
 .../components/inputs/AppDateTimeInput.svelte |  2 +
 .../components/inputs/AppFileInput.svelte     | 54 +++++++++----------
 .../components/inputs/AppTextInput.svelte     |  1 -
 .../apps/editor/component/components.ts       | 22 +++++++-
 .../apps/svelte-select/lib/Select.svelte      |  3 +-
 .../common/fileInput/FileInput.svelte         |  2 +
 frontend/src/lib/defaults.ts                  |  2 +-
 9 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/frontend/src/lib/assets/app.css b/frontend/src/lib/assets/app.css
index 0744e287f6..ee706b19e6 100644
--- a/frontend/src/lib/assets/app.css
+++ b/frontend/src/lib/assets/app.css
@@ -145,5 +145,7 @@
 
 .app-editor-input {
 	@apply rounded-component border border-gray-300 dark:border-gray-500 focus:border-gray-300 focus:dark:border-gray-500 focus:!ring-1 focus:!ring-blue-300;
-	@apply placeholder:text-gray-400 dark:placeholder:text-gray-600;
+	@apply placeholder:text-gray-400 dark:placeholder:text-gray-200;
+	@apply bg-surface;
+	@apply disabled:placeholder:text-gray-200 disabled:placeholder:dark:text-gray-500 disabled:text-gray-200 disabled:dark:text-gray-500 disabled:border-gray-200 disabled:dark:border-gray-600;
 }
diff --git a/frontend/src/lib/components/DateTimeInput.svelte b/frontend/src/lib/components/DateTimeInput.svelte
index 5e3f95af6e..6d22ccca8e 100644
--- a/frontend/src/lib/components/DateTimeInput.svelte
+++ b/frontend/src/lib/components/DateTimeInput.svelte
@@ -2,6 +2,7 @@
 	import { createEventDispatcher } from 'svelte'
 	import { Button } from './common'
 	import { Clock } from 'lucide-svelte'
+	import { twMerge } from 'tailwind-merge'
 	// import ToggleButtonGroup from './common/toggleButton-v2/ToggleButtonGroup.svelte'
 	// import ToggleButton from './common/toggleButton-v2/ToggleButton.svelte'
 
@@ -11,6 +12,8 @@
 	export let useDropdown: boolean = false
 	export let minDate: string | undefined = undefined
 	export let maxDate: string | undefined = undefined
+	export let disabled: boolean | undefined = undefined
+	export let inputClass: string | undefined = undefined
 
 	let date: string | undefined = undefined
 	let time: string | undefined = undefined
@@ -72,17 +75,25 @@
 		type="date"
 		bind:value={date}
 		{autofocus}
-		class="!w-3/4 app-editor-input"
+		{disabled}
+		class={twMerge('h-8 text-sm !w-3/4 ', inputClass)}
 		min={minDate}
 		max={maxDate}
 	/>
-	<input type="time" bind:value={time} class="!w-1/4 min-w-[100px] app-editor-input" />
+	<input
+		type="time"
+		bind:value={time}
+		class={twMerge('h-8 text-sm !w-1/4 min-w-[100px] ', inputClass)}
+		{disabled}
+	/>
 	<Button
 		variant="border"
 		color="light"
+		wrapperClasses="h-8"
 		startIcon={{
 			icon: Clock
 		}}
+		{disabled}
 		size="xs"
 		portalTarget={`#${randomId}`}
 		dropdownItems={useDropdown
diff --git a/frontend/src/lib/components/apps/components/inputs/AppDateTimeInput.svelte b/frontend/src/lib/components/apps/components/inputs/AppDateTimeInput.svelte
index b12df32600..7dc67ad5a6 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppDateTimeInput.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppDateTimeInput.svelte
@@ -138,6 +138,7 @@
 					e.stopPropagation()
 					$selectedComponent = [id]
 				}}
+				inputClass={twMerge('windmillapp w-full py-1.5 px-2 text-sm', 'app-editor-input')}
 				minDate={resolvedConfig.minDateTime
 					? formatDate(resolvedConfig.minDateTime, 'yyyy-MM-dd')
 					: undefined}
@@ -145,6 +146,7 @@
 					? formatDate(resolvedConfig.maxDateTime, 'yyyy-MM-dd')
 					: undefined}
 				on:focus={() => ($selectedComponent = [id])}
+				disabled={resolvedConfig.disabled}
 			/>
 		{/if}
 	</div>
diff --git a/frontend/src/lib/components/apps/components/inputs/AppFileInput.svelte b/frontend/src/lib/components/apps/components/inputs/AppFileInput.svelte
index f30e7350fc..fa8e956709 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppFileInput.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppFileInput.svelte
@@ -2,35 +2,36 @@
 	import { getContext } from 'svelte'
 	import { twMerge } from 'tailwind-merge'
 	import { FileInput } from '../../../common'
-	import { initOutput } from '../../editor/appUtils'
+	import { initConfig, initOutput } from '../../editor/appUtils'
 	import type { AppViewerContext, ComponentCustomCSS, RichConfigurations } from '../../types'
 	import { initCss } from '../../utils'
-	import InputValue from '../helpers/InputValue.svelte'
 	import InitializeComponent from '../helpers/InitializeComponent.svelte'
 	import ResolveStyle from '../helpers/ResolveStyle.svelte'
+	import { components } from '../../editor/component'
+	import ResolveConfig from '../helpers/ResolveConfig.svelte'
 
 	export let id: string
 	export let configuration: RichConfigurations
 	export let customCss: ComponentCustomCSS<'fileinputcomponent'> | undefined = undefined
 	export let render: boolean
 	export let onFileChange: string[] | undefined = undefined
+	export let extraKey: string | undefined = undefined
 
 	const { app, worldStore, componentControl, mode, runnableComponents } =
 		getContext<AppViewerContext>('AppViewerContext')
 
-	let acceptedFileTypes: string[] | undefined = undefined
-	let allowMultiple: boolean | undefined = undefined
-	let text: string | undefined = undefined
-	let includeMimeType: boolean | undefined = undefined
-	let submittedFileText: string | undefined = undefined
-
 	let outputs = initOutput($worldStore, id, {
 		result: [] as { name: string; data: string }[] | undefined
 	})
 
+	let resolvedConfig = initConfig(
+		components['fileinputcomponent'].initialData.configuration,
+		configuration
+	)
+
 	// Receives Base64 encoded strings from the input component
 	async function handleChange(files: { name: string; data: string }[] | undefined) {
-		if (includeMimeType === false) {
+		if (resolvedConfig?.includeMimeType === false) {
 			files = files?.map((file) => {
 				const [_, data] = file.data.split('base64,')
 				return { name: file.name, data }
@@ -73,21 +74,15 @@
 	/>
 {/each}
 
-<InputValue
-	key="accepted"
-	{id}
-	input={configuration.acceptedFileTypes}
-	bind:value={acceptedFileTypes}
-/>
-<InputValue key="multiple" {id} input={configuration.allowMultiple} bind:value={allowMultiple} />
-<InputValue key="text" {id} input={configuration.text} bind:value={text} />
-<InputValue key="mime" {id} input={configuration.includeMimeType} bind:value={includeMimeType} />
-<InputValue
-	key="submittedFileText"
-	{id}
-	input={configuration.submittedFileText}
-	bind:value={submittedFileText}
-/>
+{#each Object.keys(components['fileinputcomponent'].initialData.configuration) as key (key)}
+	<ResolveConfig
+		{id}
+		{extraKey}
+		{key}
+		bind:resolvedConfig={resolvedConfig[key]}
+		configuration={configuration[key]}
+	/>
+{/each}
 
 <InitializeComponent {id} />
 
@@ -95,8 +90,10 @@
 	<div class="w-full h-full">
 		<FileInput
 			bind:this={fileInput}
-			accept={acceptedFileTypes?.length ? acceptedFileTypes?.join(', ') : undefined}
-			multiple={allowMultiple}
+			accept={resolvedConfig?.acceptedFileTypes?.length
+				? resolvedConfig?.acceptedFileTypes?.join(', ')
+				: undefined}
+			multiple={resolvedConfig?.allowMultiple}
 			convertTo="base64"
 			returnFileNames
 			on:change={({ detail }) => {
@@ -104,10 +101,11 @@
 			}}
 			class={twMerge('w-full h-full', css?.container?.class, 'wm-file-input')}
 			style={css?.container?.style}
-			submittedText={submittedFileText}
+			submittedText={resolvedConfig?.submittedFileText}
+			disabled={resolvedConfig.disabled}
 			bind:files
 		>
-			{text}
+			{resolvedConfig?.text}
 		</FileInput>
 	</div>
 {/if}
diff --git a/frontend/src/lib/components/apps/components/inputs/AppTextInput.svelte b/frontend/src/lib/components/apps/components/inputs/AppTextInput.svelte
index 2f1030d3e1..c07c316193 100644
--- a/frontend/src/lib/components/apps/components/inputs/AppTextInput.svelte
+++ b/frontend/src/lib/components/apps/components/inputs/AppTextInput.svelte
@@ -76,7 +76,6 @@
 		'windmillapp w-full py-1.5 px-2 text-sm',
 		'app-editor-input',
 		css?.input?.class ?? '',
-		resolvedConfig.disabled ? 'placeholder:text-gray-400 dark:placeholder:text-gray-600' : '',
 		'wm-input',
 		'wm-text-input'
 	)
diff --git a/frontend/src/lib/components/apps/editor/component/components.ts b/frontend/src/lib/components/apps/editor/component/components.ts
index ee46dfef50..e84ad83847 100644
--- a/frontend/src/lib/components/apps/editor/component/components.ts
+++ b/frontend/src/lib/components/apps/editor/component/components.ts
@@ -2189,6 +2189,11 @@ This is a paragraph.
 					value: true,
 
 					tooltip: 'Set the width of the options popup to 100% of the select width'
+				},
+				disabled: {
+					type: 'static',
+					fieldType: 'boolean',
+					value: false
 				}
 			}
 		}
@@ -2627,6 +2632,11 @@ See date-fns format for more information. By default, it is 'dd.MM.yyyy HH:mm'
 					type: 'static',
 					value: undefined,
 					fieldType: 'datetime'
+				},
+				disabled: {
+					type: 'static',
+					value: false,
+					fieldType: 'boolean'
 				}
 			}
 		}
@@ -2893,6 +2903,11 @@ See date-fns format for more information. By default, it is 'dd.MM.yyyy HH:mm'
 					type: 'static',
 					value: 'Selected file',
 					fieldType: 'text'
+				},
+				disabled: {
+					type: 'static',
+					value: false,
+					fieldType: 'boolean'
 				}
 			}
 		}
@@ -3551,7 +3566,12 @@ See date-fns format for more information. By default, it is 'dd.MM.yyyy HH:mm'
 								fieldType: 'template',
 								connections: [],
 								onDemandOnly: true
-							} as EvalV2AppInput
+							} as EvalV2AppInput,
+							disabled: {
+								type: 'static',
+								value: false,
+								fieldType: 'boolean'
+							}
 						}
 					}
 				} as const
diff --git a/frontend/src/lib/components/apps/svelte-select/lib/Select.svelte b/frontend/src/lib/components/apps/svelte-select/lib/Select.svelte
index a0831b0d47..b0d8e4938c 100644
--- a/frontend/src/lib/components/apps/svelte-select/lib/Select.svelte
+++ b/frontend/src/lib/components/apps/svelte-select/lib/Select.svelte
@@ -668,7 +668,6 @@
 			bind:value={filterText}
 			placeholder={placeholderText}
 			style={inputStyles}
-			{disabled}
 		/>
 	</div>
 
@@ -867,7 +866,7 @@
 
 	.disabled input::placeholder {
 		color: var(--disabled-placeholder-color, #c1c6cc);
-		opacity: var(--disabled-placeholder-opacity, 1);
+		opacity: var(--disabled-placeholder-opacity, 0.8);
 	}
 
 	.selected-item {
diff --git a/frontend/src/lib/components/common/fileInput/FileInput.svelte b/frontend/src/lib/components/common/fileInput/FileInput.svelte
index ba2f374b79..1ce7347143 100644
--- a/frontend/src/lib/components/common/fileInput/FileInput.svelte
+++ b/frontend/src/lib/components/common/fileInput/FileInput.svelte
@@ -18,6 +18,7 @@
 	export let returnFileNames = false
 	export let submittedText: string | undefined = undefined
 	export let defaultFile: string | undefined = undefined
+	export let disabled: boolean | undefined = undefined
 
 	const dispatch = createEventDispatcher()
 	let input: HTMLInputElement
@@ -133,6 +134,7 @@
 	on:dragover={handleDragOver}
 	on:drop={handleDrop}
 	{style}
+	{disabled}
 >
 	{#if !hideIcon && !files}
 		<FileUp size={iconSize} class="mb-2" />
diff --git a/frontend/src/lib/defaults.ts b/frontend/src/lib/defaults.ts
index 0367444982..17ffdec1c2 100644
--- a/frontend/src/lib/defaults.ts
+++ b/frontend/src/lib/defaults.ts
@@ -2,5 +2,5 @@ export const SELECT_INPUT_DEFAULT_STYLE = {
 	inputStyles: 'border-radius: 0;',
 	containerStyles: '--height: 34px; --padding: 0 0 0 8px; --font-size: 0.875rem;',
 	containerStylesDark:
-		'--height: 34px; --padding: 0 0 0 8px; --font-size: 0.875rem; --background: #3b4252; --disabled-background: #2a2f3a; --list-background: #3b4252;--item-is-active-bg:#434c5e;--item-hover-bg:#4c566a;'
+		'--height: 34px; --padding: 0 0 0 8px; --font-size: 0.875rem; --disabled-border-color: #3e4c60; --background: #2e3440; --disabled-background: transparent; --list-background: #3b4252;--item-is-active-bg:#434c5e;--item-hover-bg:#4c566a;'
 } as const