Merge branch 'textarea-wysiwyg' into 'develop'

Textarea wysiwyg

See merge request ldc-web/projets/ldc!57
This commit is contained in:
karl.muller 2025-11-18 14:29:14 +00:00
commit 6a87cf4ecb
19 changed files with 265 additions and 100 deletions

View file

@ -9,15 +9,17 @@ enum DynamicFieldTypes: int
use BaseEnum;
// Name must be one word in lowercase.
case string = 1;
case text = 2;
case number = 3;
case boolean = 4;
case url = 5;
case email = 6;
case image = 7;
case list = 8;
// case color = 9;
case string = 1;
case textarea = 2;
case wysiwyg = 3;
case number = 4;
case boolean = 5;
case url = 6;
case email = 7;
case image = 8;
case list = 9;
// case color = 10;
// case date = 11;
/**
* Labels definition.
@ -25,28 +27,30 @@ enum DynamicFieldTypes: int
* @phpstan-ignore-next-line
*/
private const LABELS = [
self::string->name => 'enums.dynamic-field-types.string',
self::text->name => 'enums.dynamic-field-types.text',
self::number->name => 'enums.dynamic-field-types.number',
self::boolean->name => 'enums.dynamic-field-types.boolean',
self::url->name => 'enums.dynamic-field-types.url',
self::email->name => 'enums.dynamic-field-types.email',
self::image->name => 'enums.dynamic-field-types.image',
self::list->name => 'enums.dynamic-field-types.list',
self::string->name => 'enums.dynamic-field-types.string',
self::textarea->name => 'enums.dynamic-field-types.textarea',
self::wysiwyg->name => 'enums.dynamic-field-types.wysiwyg',
self::number->name => 'enums.dynamic-field-types.number',
self::boolean->name => 'enums.dynamic-field-types.boolean',
self::url->name => 'enums.dynamic-field-types.url',
self::email->name => 'enums.dynamic-field-types.email',
self::image->name => 'enums.dynamic-field-types.image',
self::list->name => 'enums.dynamic-field-types.list',
];
/**
* Validations definition.
*/
private const VALIDATIONS = [
self::string->name => 'required|string|between:3,255',
self::text->name => 'required|string|string|min:15',
self::number->name => 'required|numeric|min:0',
self::boolean->name => 'required|boolean',
self::url->name => 'required|url:https',
self::email->name => 'required|email:rfc,strict,dns,spoof,filter',
self::image->name => 'required|file|mimes:jpg,jpeg,png,pdf|max:5120|dimensions:width=100,height=100',
self::list->name => 'required|array|min:1|max:10',
self::string->name => 'required|string|between:3,255',
self::textarea->name => 'required|string|string|min:15',
self::wysiwyg->name => 'required|string|string|min:15',
self::number->name => 'required|numeric|min:0',
self::boolean->name => 'required|boolean',
self::url->name => 'required|url:https',
self::email->name => 'required|email:rfc,strict,dns,spoof,filter',
self::image->name => 'required|file|mimes:jpg,jpeg,png,pdf|max:5120|dimensions:width=100,height=100',
self::list->name => 'required|array|min:1|max:10',
];
/**
@ -61,15 +65,18 @@ enum DynamicFieldTypes: int
/**
* Is array definition.
*
* @return array
*/
private const ISARRAY = [
self::string->name => false,
self::text->name => false,
self::number->name => false,
self::boolean->name => false,
self::url->name => false,
self::email->name => false,
self::image->name => false,
self::list->name => true,
self::string->name => false,
self::textarea->name => false,
self::wysiwyg->name => false,
self::number->name => false,
self::boolean->name => false,
self::url->name => false,
self::email->name => false,
self::image->name => false,
self::list->name => true,
];
}

View file

@ -95,7 +95,7 @@ class DynamicPageHelper
*/
protected static function removeWysiwygImages(array $oldContent, array $newContent): void
{
$prefix = DynamicFieldTypes::text->name . '_';
$prefix = DynamicFieldTypes::wysiwyg->name . '_';
static::getDynamicFieldKeys($oldContent, $newContent, $prefix)
->each(function ($key) use ($oldContent) {

View file

@ -67,8 +67,8 @@ abstract class UpdateDynamicFieldRequest extends FormRequest
$ruleKey => $this->compileValidate(DynamicFieldTypes::string->getValidation(), $input)
]);
break;
case DynamicFieldTypes::text->value:
$mergeRules = $this->compileValidate(DynamicFieldTypes::text->getValidation(), $input);
case DynamicFieldTypes::wysiwyg->value:
$mergeRules = $this->compileValidate(DynamicFieldTypes::wysiwyg->getValidation(), $input);
$mergeRules = collect($mergeRules)
->map(function ($rule) {
// TODO: check pour utiliser la rule wysiwyg length.
@ -92,13 +92,9 @@ abstract class UpdateDynamicFieldRequest extends FormRequest
]);
break;
case DynamicFieldTypes::boolean->value:
$all = $this->all();
$nested = ToolboxHelper::dotStringToNestedArray(
$ruleKey,
$this->input($ruleKey) ? true : false
);
$all = ToolboxHelper::arrayMergeRecursiveDistinct($all, $nested);
$this->merge($all);
$all = $this->all();
$modified = $this->castBooleanFields($all);
$this->merge($modified);
$rules = array_merge($rules, [
$ruleKey => $this->compileValidate(DynamicFieldTypes::boolean->getValidation(), $input)
]);
@ -279,4 +275,28 @@ abstract class UpdateDynamicFieldRequest extends FormRequest
}
return $itemKey;
}
/**
* Recursively traverses an array and converts it to Boolean
* all values whose key begins with “boolean_”.
*
* @param array $data
* @return array
*/
private function castBooleanFields(array $data): array
{
foreach ($data as $key => $value) {
// If the value is an array, recursive method.
if (is_array($value)) {
$data[$key] = $this->castBooleanFields($value);
continue;
}
// Check if the key start with the pattern enum_.
if (str_starts_with($key, sprintf("%s_", DynamicFieldTypes::boolean->name))) {
// Manages values "true", "false", "1", "0", 1, 0, "on", "off".
$data[$key] = filter_var($value, FILTER_VALIDATE_BOOLEAN);
}
}
return $data;
}
}

View file

@ -46,7 +46,10 @@ class DynamicPageFactory extends Factory
case DynamicFieldTypes::string->value:
$configValue[$field['key']] = fake()->words(5, true);
break;
case DynamicFieldTypes::text->value:
case DynamicFieldTypes::textarea->value:
$configValue[$field['key']] = fake()->words(10, true);
break;
case DynamicFieldTypes::wysiwyg->value:
$configValue[$field['key']] = sprintf("<p>%s</p>", fake()->text(160));
break;
case DynamicFieldTypes::number->value:
@ -58,6 +61,21 @@ class DynamicPageFactory extends Factory
case DynamicFieldTypes::url->value:
$configValue[$field['key']] = fake()->url();
break;
case DynamicFieldTypes::email->value:
$configValue[$field['key']] = fake()->email();
break;
case DynamicFieldTypes::image->value:
// Fake image in seeder.
$configValue[$field['key']] = null;
break;
case DynamicFieldTypes::list->value:
$configValue[$field['key']] = [
[
$field['children'][0]['key'] => fake()->unique()->word(),
'order' => 1,
],
];
break;
default:
$configValue = [];
break;

View file

@ -17,19 +17,33 @@ class PageConfigFactory extends Factory
public function definition(): array
{
$enum = \collect(DynamicFieldTypes::toArray())->random();
$slug = Str::slug($enum->label);
return [
$data = [
'label' => fake()->unique()->word(),
'view' => fake()->boolean(50) ? PageConfig::$defaultView : null,
'config' => [
[
'type' => $enum->value,
'key' => sprintf("%s_%s", $enum->name, $slug),
'key' => sprintf("%s_%s", $enum->name, Str::slug($enum->label)),
'label' => $enum->label,
'validation' => $enum->validation,
'order' => 1,
]
],
],
];
if ($enum->value === DynamicFieldTypes::list->value) {
// Set only one string input for the example.
$defaultEnum = DynamicFieldTypes::string;
$data['config'][0]['children'] = [
[
'type' => $defaultEnum->value(),
'key' => sprintf("%s_%s", $defaultEnum->name(), Str::slug($defaultEnum->label())),
'label' => $defaultEnum->label(),
'validation' => $defaultEnum->getValidation(),
'order' => 1,
],
];
}
return $data;
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 750 B

View file

@ -2,8 +2,11 @@
namespace Database\Seeders;
use App\Enums\DynamicFieldTypes;
use App\Models\DynamicPage;
use Illuminate\Database\Seeder;
use Illuminate\Support\Str;
use Uwil\LaravelCommon\Helpers\FileHelper;
class DynamicPageSeeder extends Seeder
{
@ -14,6 +17,23 @@ class DynamicPageSeeder extends Seeder
*/
public function run(): void
{
DynamicPage::factory(10)->create();
DynamicPage::factory(10)->make()
->each(function ($model) {
$content = $model->content;
// Config factories add just one depth of children.
foreach ($model->content as $key => $value) {
$prefix = sprintf("%s_", DynamicFieldTypes::image->name);
if (Str::startsWith($key, $prefix)) {
$content[$key] = FileHelper::storeFile(
$model,
new \SplFileInfo(\resource_path(
'../database/factories/assets/dynamic-pages/100x100.jpg'
))
);
}
}
$model->content = $content;
$model->saveOrFail();
});
}
}

View file

@ -12,14 +12,15 @@ return [
'unpublished' => 'Unpublished',
],
'dynamic-field-types' => [
'string' => 'String',
'text' => 'Text',
'number' => 'Number',
'boolean' => 'Boolean',
'url' => 'Link',
'email' => 'E-mail',
'image' => 'Image',
'list' => 'Item list'
'string' => 'String',
'textarea' => 'Textarea',
'wysiwyg' => 'Wysiwyg',
'number' => 'Number',
'boolean' => 'Boolean',
'url' => 'Link',
'email' => 'E-mail',
'image' => 'Image',
'list' => 'Item list'
],
'contactFormType' => [
'collaborator' => [

View file

@ -12,14 +12,15 @@ return [
'unpublished' => 'Dépublié',
],
'dynamic-field-types' => [
'string' => 'Chaîne de caractères',
'text' => 'Textuel',
'number' => 'Numérique',
'boolean' => 'Booléen',
'url' => 'Lien',
'email' => 'E-mail',
'image' => 'Image',
'list' => 'Liste de champs'
'string' => 'Chaîne de caractères',
'textarea' => 'Textarea',
'wysiwyg' => 'Wysiwyg',
'number' => 'Numérique',
'boolean' => 'Booléen',
'url' => 'Lien',
'email' => 'E-mail',
'image' => 'Image',
'list' => 'Liste de champs'
],
'contactFormType' => [
'collaborator' => [

View file

@ -7,6 +7,7 @@ import SimpleSwitch from "@/back/Components/Inputs/SimpleSwitch";
import SimpleWysiwyg from "@/back/Components/Inputs/SimpleWysiwyg";
import ImageCropperWrapper from "@/back/Components/Inputs/ImageCropper/ImageCropperWrapper";
import DynamicList from "@/back/Components/DynamicPages/DynamicList";
import SimpleTextarea from "@/back/Components/Inputs/SimpleTextarea";
import { ConfigField, DynamicFieldTypes, DynamicInternalField } from "@/back/types/global";
import str from "@/hooks/use-string";
import useTrans from "@/hooks/use-translations";
@ -20,8 +21,10 @@ type DynamicInputsProps = {
name: string;
config: ConfigField[];
content: DynamicInternalField | null;
isChildren?: boolean;
setData: (name: string, value: string | boolean | File | object | null) => void;
reset: (name?: string) => void;
parentErrors?: Record<string, string> | null,
};
// Allows to get specific input from enum value.
@ -29,8 +32,10 @@ export default function DynamicInputs({
name,
config,
content = null,
isChildren = false,
setData,
reset,
parentErrors,
}: DynamicInputsProps) {
// Enums.
const enumDynamicFieldTypes = usePage().props.enumDynamicFieldTypes as DynamicFieldTypes;
@ -75,10 +80,23 @@ export default function DynamicInputs({
required={extractRequiredValidation(field.validation)}
value={String(fieldValue)}
setData={setData}
parentErrors={parentErrors}
/>
);
// Textarea input.
case enumDynamicFieldTypes.textarea.value:
return (
<SimpleTextarea
key={id}
name={fieldName}
label={getTrans(field.label)}
value={String(fieldValue)}
setData={setData}
parentErrors={parentErrors}
/>
);
// Wysiwyg input.
case enumDynamicFieldTypes.text.value:
case enumDynamicFieldTypes.wysiwyg.value:
return (
<div key={id} className="col-span-1 md:col-span-2">
<SimpleWysiwyg
@ -87,6 +105,7 @@ export default function DynamicInputs({
label={getTrans(field.label)}
value={String(fieldValue)}
setData={setData}
parentErrors={parentErrors}
/>
</div>
);
@ -181,6 +200,7 @@ export default function DynamicInputs({
enumLabel={enumDynamicFieldTypes.list.label}
setData={setData}
reset={reset}
isChildren={isChildren}
/>
);
default:

View file

@ -3,6 +3,8 @@ import { CSS } from "@dnd-kit/utilities";
import { GripVerticalIcon, TrashIcon } from "lucide-react";
import { closestCenter, DndContext, DragEndEvent, PointerSensor, useSensor, useSensors } from "@dnd-kit/core";
import { arrayMove, SortableContext, useSortable, verticalListSortingStrategy } from "@dnd-kit/sortable";
import { useState } from "react";
import { usePage } from "@inertiajs/react";
// * Components shadcn
import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion";
import { Card, CardContent } from "@/components/ui/card";
@ -14,6 +16,7 @@ import DynamicInputs from "@/back/Components/DynamicPages/DynamicInputs";
import useTrans from "@/hooks/use-translations";
import { extractMinMaxFromValidation, extractRequiredValidation } from "@/hooks/use-laravel-validation";
import { ConfigField, DynamicInternalField } from "@/back/types/global";
import { cn } from "@/lib/utils";
type DynamicListProps = {
name: string,
@ -22,6 +25,7 @@ type DynamicListProps = {
enumLabel: string,
field: ConfigField,
content: DynamicInternalField | null;
isChildren: boolean;
setData: (name: string, value: string | boolean | File | object | null) => void;
reset: (name?: string) => void;
}
@ -34,6 +38,7 @@ export default function DynamicList({
enumLabel,
field,
content,
isChildren,
setData,
reset,
}: DynamicListProps) {
@ -48,6 +53,10 @@ export default function DynamicList({
);
}
// Errors.
const { errors } = usePage().props;
const [localErrors, setLocalErrors] = useState<Record<string, string>>(errors)
// Drag & drop module for user interactions (mouse, touch, keyboard or other).
const sensors = useSensors(useSensor(PointerSensor));
@ -63,6 +72,9 @@ export default function DynamicList({
const isRequired = extractRequiredValidation(field.validation);
const configLimitMax = extractMinMaxFromValidation(field.validation).max ?? 1;
// Accordion open index.
const [openIndex, setOpenIndex] = useState<string>("");
/**
* Get all elements without each unique identification values.
* @param fields DynamicInternalField[]
@ -104,6 +116,8 @@ export default function DynamicList({
list.splice(index, 1);
// Save the new list updated.
setData(`${parentName}.${fieldKey}`, list);
// Reset all errors because of alter elements list.
setLocalErrors({});
}
/**
@ -158,6 +172,8 @@ export default function DynamicList({
type="single"
collapsible
className="w-full"
value={openIndex}
onValueChange={setOpenIndex}
>
{/*
The main provider for dnd-kit.
@ -189,6 +205,9 @@ export default function DynamicList({
setData={setData}
reset={reset}
removeField={handleRemoveField}
parentAccordionState={openIndex}
setParentAccordionState={setOpenIndex}
localErrors={localErrors}
/>
))}
</SortableContext>
@ -199,6 +218,7 @@ export default function DynamicList({
array={sortedListItems}
limitMax={configLimitMax}
onClick={handleAddNewField}
variant={isChildren ? "secondary" : "default"}
/>
</div>
)
@ -214,6 +234,9 @@ type SortableItemProps = {
setData: (name: string, value: string | boolean | File | object | null) => void;
reset: (name?: string) => void;
removeField: (parentName: string, fieldKey: string, index: number) => void;
parentAccordionState: string;
setParentAccordionState: (key: string) => void;
localErrors: Record<string, string>;
}
// Recursive component.
@ -227,6 +250,9 @@ function SortableItem({
setData,
reset,
removeField,
parentAccordionState,
setParentAccordionState,
localErrors,
}: SortableItemProps) {
// Provides the necessary props and helpers to make this item draggable and reorderable.
// Includes event listeners, accessibility attributes, DOM ref, drag transform/transition values,
@ -251,7 +277,9 @@ function SortableItem({
return (
<div ref={setNodeRef} style={style} className="relative mb-3">
<AccordionItem value={`item-${itemIndex}`}>
<Card className="errors-classes">
<Card className={cn({
"border-destructive/50 dark:border-destructive": parentAccordionState !== `item-${itemIndex}` && Object.keys(localErrors).some(key => key.startsWith(`${name}.${itemIndex}`)),
})}>
<CardContent className="flex flex-col p-3">
<div className="flex flex-col lg:flex-row-reverse gap-1.5">
<div className="flex flex-row gap-1.5 w-full h-full">
@ -264,6 +292,7 @@ function SortableItem({
type="button"
variant="outline"
size="icon"
disable={parentAccordionState !== ""}
{...listeners}
{...attributes}
/>
@ -275,7 +304,12 @@ function SortableItem({
type="button"
variant="destructive"
size="icon"
onClick={() => removeField(parentName, field.key, itemIndex)}
onClick={() => {
if (parentAccordionState === `item-${itemIndex}`) {
setParentAccordionState("")
}
removeField(parentName, field.key, itemIndex)
}}
/>
</div>
{/* Define the trigger button to open or close the current accordion. */}
@ -293,6 +327,8 @@ function SortableItem({
content={item}
setData={setData}
reset={reset}
parentErrors={localErrors}
isChildren={true}
/>
</AccordionContent>
</CardContent>

View file

@ -4,7 +4,6 @@ import InputError from "@/back/Components/InputError";
import { usePage } from "@inertiajs/react";
import { Calendar } from "@/components/ui/calendar";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import { useState } from "react";
import { Button } from "@/components/ui/button";
import { CalendarIcon, RefreshCcw } from "lucide-react";
import { cn } from "@/lib/utils";
@ -16,27 +15,35 @@ import { Separator } from "@/components/ui/separator";
import str from "@/hooks/use-string";
import useTrans from "@/hooks/use-translations";
type SimpleDatePickerProps = {
name: string;
placeholder?: string;
date?: Date | null;
required?: boolean;
disabled?: boolean;
className?: string;
label: string;
hasTime?: boolean;
parentErrors?: Record<string, string> | null,
// eslint-disable-next-line no-unused-vars
setData: (name: string, value: Date | null) => void;
}
export default function SimpleDatePicker({
name,
placeholder = "Sélectionner une date",
date,
required = false,
disabled = false,
setData,
className,
label,
hasTime = false
}: {
name: string;
placeholder?: string;
date?: Date | null;
required?: boolean;
disabled?: boolean;
setData: Function;
className?: string;
label: string;
hasTime?: boolean;
}) {
hasTime = false,
parentErrors = null,
setData,
}: SimpleDatePickerProps) {
const { errors } = usePage().props;
const localErrors = parentErrors ?? errors;
let calendarLocale = fr;
switch (usePage().props.locale) {
case "en":
@ -48,7 +55,6 @@ export default function SimpleDatePicker({
}
const parsedDate = date ? new Date(date) : undefined;
const errors = usePage().props.errors;
const hours = Array.from({ length: 24 }, (_, i) => i);
const minutes = Array.from({ length: 12 }, (_, i) => i * 5);
const handleDateSelect = (selectedDate: Date | undefined) => {
@ -171,7 +177,7 @@ export default function SimpleDatePicker({
</div>
</PopoverContent>
</Popover>
<InputError message={errors[name]} />
<InputError message={localErrors[name]} />
</div>
);
}

View file

@ -20,6 +20,8 @@ type SimpleNumberProps = {
placeholder?: string;
required?: boolean;
disabled?: boolean;
parentErrors?: Record<string, string> | null,
// eslint-disable-next-line no-unused-vars
setData: (name: string, value: string) => void;
};
@ -34,14 +36,17 @@ export default function SimpleNumber({
placeholder = "back.enter_number_here",
required = true,
disabled = false,
parentErrors = null,
setData,
}: SimpleNumberProps) {
const { errors } = usePage().props;
const localErrors = parentErrors ?? errors;
const localLimits = {
min: limits?.min ? limits.min : 1,
max: limits?.max ? limits.max : 1000
}
const safeValue = value >= localLimits.min && value <= localLimits.max ? value : localLimits.min;
const { errors } = usePage().props;
const [inputValue, setInputValue] = useState(safeValue);
@ -70,11 +75,11 @@ export default function SimpleNumber({
required={required}
disabled={disabled}
className={cn("w-full", {
"border-destructive/50": errors[name],
"border-destructive/50": localErrors[name],
})}
/>
</div>
<InputError message={errors[name]} />
<InputError message={localErrors[name]} />
</div>
);
}

View file

@ -11,6 +11,7 @@ type SimpleSwitchProps = {
checked?: boolean;
required?: boolean;
disabled?: boolean;
parentErrors?: Record<string, string> | null,
// eslint-disable-next-line no-unused-vars
setData: (name: string, value: boolean) => void;
};
@ -20,9 +21,12 @@ export default function SimpleSwitch({
checked,
required = false,
disabled = false,
parentErrors = null,
setData,
}: SimpleSwitchProps) {
const { errors } = usePage().props;
const localErrors = parentErrors ?? errors;
return (
<div className="flex flex-col items-start w-fit gap-1.5">
<Switch
@ -31,9 +35,9 @@ export default function SimpleSwitch({
required={required}
checked={checked}
disabled={disabled}
className={cn({ "border-destructive/50": errors[name] })}
className={cn({ "border-destructive/50": localErrors[name] })}
/>
<InputError message={errors[name]} />
<InputError message={localErrors[name]} />
</div>
);
}

View file

@ -9,21 +9,22 @@ import WordCounter from "@/back/Components/WordCounter";
import useTrans from "@/hooks/use-translations";
import { cn } from "@/lib/utils";
type SimpleTextProps = {
type SimpleTextareaProps = {
className?: string;
name: string;
label: string;
value?: string;
id?: string;
placeholder: string;
placeholder?: string;
wordCounter?: boolean;
required?: boolean;
disabled?: boolean;
parentErrors?: Record<string, string> | null,
// eslint-disable-next-line no-unused-vars
setData: (name: string, value: string) => void;
};
export default function SimpleText({
export default function SimpleTextarea({
className,
name,
label,
@ -33,9 +34,12 @@ export default function SimpleText({
wordCounter = true,
required = true,
disabled = false,
parentErrors = null,
setData,
}: SimpleTextProps) {
}: SimpleTextareaProps) {
const { errors } = usePage().props;
const localErrors = parentErrors ?? errors;
return (
<div
className={cn(
@ -56,10 +60,10 @@ export default function SimpleText({
}}
required={required}
disabled={disabled}
className={cn("w-full", { "border-destructive/50": errors[name] })}
className={cn("w-full", { "border-destructive/50": localErrors[name] })}
/>
</div>
<InputError message={errors[name]} />
<InputError message={localErrors[name]} />
</div>
);
}

View file

@ -43,6 +43,7 @@ type SimpleWysiwygProps = {
wordCounter?: boolean;
required?: boolean;
disabled?: boolean;
parentErrors?: Record<string, string> | null,
// eslint-disable-next-line no-unused-vars
setData: (name: string, value: string) => void;
};
@ -58,9 +59,12 @@ export default function SimpleWysiwyg({
wordCounter = true,
required = true,
disabled = false,
parentErrors = null,
setData,
}: SimpleWysiwygProps) {
const { errors } = usePage().props;
const localErrors = parentErrors ?? errors;
const extensions = [
BaseKit.configure({
placeholder: {
@ -136,10 +140,10 @@ export default function SimpleWysiwyg({
}, [value]);
return (
<div className={cn("col-span-2", { "wysiwyg-error": errors[name] }, className)}>
<div className={cn("col-span-2", { "wysiwyg-error": localErrors[name] }, className)}>
<Label htmlFor={name}>{label + (required ? " *" : "")}</Label>
{wordCounter && <WordCounter value={content.replace(/<[^>]*>/g, "")} />}
<div className={cn("mt-1.5", { "mb-1.5": errors[name] })}>
<div className={cn("mt-1.5", { "mb-1.5": localErrors[name] })}>
<RichTextEditor
// Force re-render.
key={version}
@ -153,7 +157,7 @@ export default function SimpleWysiwyg({
dark={false}
/>
</div>
<InputError message={errors[name]} />
<InputError message={localErrors[name]} />
</div>
);
}

View file

@ -196,6 +196,7 @@ export default function DynamicFields({
*/
const removeSensitiveField = (keyToRemove: string): void => {
setOriginalConfigKeys(prev => prev.filter((key) => key !== keyToRemove));
// Reset all errors because of alter elements list.
setLocalErrors({});
};

View file

@ -9,7 +9,11 @@
<p>{{ $filteredArray->first()['key'] }} ({{ $filteredArray->first()['label'] }}): {{ $value }}</p>
@break
@case(\App\Enums\DynamicFieldTypes::text->value())
@case(\App\Enums\DynamicFieldTypes::textarea->value())
<p>{{ $filteredArray->first()['key'] }} ({{ $filteredArray->first()['label'] }}): {{ $value }}</p>
@break
@case(\App\Enums\DynamicFieldTypes::wysiwyg->value())
<p>{{ $filteredArray->first()['key'] }} ({{ $filteredArray->first()['label'] }}):</p>
{!! $value !!}
@break

View file

@ -6,7 +6,7 @@
<div class="single-page__wrapper wrapper">
<x-front.pages.title :h1Class="false" :title="$dynamicPageModel->title" />
<div class="single-page__content description">
{!! $dynamicPageModel->content['text_content'] !!}
{!! $dynamicPageModel->content['wysiwyg_content'] !!}
</div>
</div>
</div>