@qwickapps/react-framework 1.4.0 → 1.4.2

package/src/schemas/GridLayoutSchema.ts

@@ -5,31 +5,25 @@
  */
 
 import type { ReactNode } from 'react';
-import { IsBoolean, IsOptional, IsString, IsNumber, IsIn } from 'class-validator';
+import { IsBoolean, IsOptional, IsString, IsNumber, IsIn, Min } from 'class-validator';
 import 'reflect-metadata';
-import { Editor, Field, Schema, Model, FieldType } from '@qwickapps/schema';
+import { Editor, Field, Schema, FieldType } from '@qwickapps/schema';
+import { ContainerSchema } from './ContainerSchema';
 
 @Schema('GridLayout', '1.0.0')
-export class GridLayoutModel extends Model {
-  @Field()
-  @Editor({
-    field_type: FieldType.TEXTAREA,
-    label: 'Children',
-    description: 'Child components to arrange in grid layout',
-    placeholder: 'Nested components will be serialized automatically'
-  })
-  children?: ReactNode; // Runtime type: supports natural React usage
+export class GridLayoutModel extends ContainerSchema {
+  // children field inherited from ContainerSchema
 
   @Field()
   @Editor({
-    field_type: FieldType.SELECT,
+    field_type: FieldType.NUMBER,
     label: 'Columns',
     description: 'Number of equal-width columns for auto-distribution'
   })
   @IsOptional()
   @IsNumber()
-  @IsIn([1, 2, 3, 4, 5, 6])
-  columns?: 1 | 2 | 3 | 4 | 5 | 6;
+  @Min(1)
+  columns?: number;
 
   @Field({ defaultValue: 'small' })
   @Editor({

package/src/schemas/HeroBlockSchema.ts

@@ -7,11 +7,12 @@
 import { IsOptional, IsString, IsUrl, IsIn, IsNumber, Min, Max, IsArray, ValidateNested } from 'class-validator';
 import { Type } from 'class-transformer';
 import 'reflect-metadata';
-import { Editor, Field, Schema, Model, FieldType, DataType } from '@qwickapps/schema';
+import { Editor, Field, Schema, FieldType, DataType } from '@qwickapps/schema';
 import { ActionModel } from './ActionSchema';
+import { ContainerSchema } from './ContainerSchema';
 
 @Schema('HeroBlock', '1.0.0')
-export class HeroBlockModel extends Model {
+export class HeroBlockModel extends ContainerSchema {
   @Field()
   @Editor({
     field_type: FieldType.TEXT,

package/src/schemas/HtmlInputFieldSchema.ts

@@ -6,10 +6,11 @@
 
 import { IsBoolean, IsNumber, IsOptional, IsString } from 'class-validator';
 import 'reflect-metadata';
-import { Editor, Field, Schema, Model, FieldType } from '@qwickapps/schema';
+import { Editor, Field, Schema, FieldType } from '@qwickapps/schema';
+import { ViewSchema } from './ViewSchema';
 
 @Schema('HtmlInputField', '1.0.0')
-export class HtmlInputFieldModel extends Model {
+export class HtmlInputFieldModel extends ViewSchema {
   @Field()
   @Editor({
     field_type: FieldType.TEXT,

package/src/schemas/ImageSchema.ts

@@ -7,7 +7,8 @@
 import type { ReactNode } from 'react';
 import { IsBoolean, IsOptional, IsString, IsNumber, IsIn } from 'class-validator';
 import 'reflect-metadata';
-import { Editor, Field, Schema, Model, FieldType, DataType } from '@qwickapps/schema';
+import { Editor, Field, Schema, FieldType, DataType } from '@qwickapps/schema';
+import { ViewSchema } from './ViewSchema';
 
 // Image fit modes - how the image should be resized to fit the container
 export type ImageFit = 'fill' | 'contain' | 'cover' | 'none' | 'scale-down';
@@ -19,7 +20,7 @@ export type ImageLoading = 'lazy' | 'eager';
 export type ImagePosition = 'center' | 'top' | 'bottom' | 'left' | 'right' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
 
 @Schema('Image', '1.0.0')
-export class ImageModel extends Model {
+export class ImageModel extends ViewSchema {
   @Field({ dataType: DataType.STRING })
   @Editor({
     field_type: FieldType.IMAGE,

package/src/schemas/PageTemplateSchema.ts

@@ -1,21 +1,21 @@
 /**
  * PageTemplate Schema - Complete page template configuration
  * 
- * Extends ViewModel to provide comprehensive page-level configuration
+ * Extends ViewSchema to provide comprehensive page-level configuration
  * including metadata, print settings, and content structure.
  * 
  * Copyright (c) 2025 QwickApps.com. All rights reserved.
  */
 
-import { IsOptional, IsString, ValidateNested } from 'class-validator';
+import { Editor, Field, FieldType, Schema } from '@qwickapps/schema';
 import { Type } from 'class-transformer';
+import { IsOptional, IsString, ValidateNested } from 'class-validator';
 import 'reflect-metadata';
-import { Editor, Field, FieldType, Model, Schema, DataType } from '@qwickapps/schema';
-import { ViewModelSchema } from './ViewModelSchema';
 import { PrintConfigSchema } from './PrintConfigSchema';
+import { ViewSchema } from './ViewSchema';
 
 @Schema('PageTemplate', '1.0.0')
-export class PageTemplateSchema extends ViewModelSchema {
+export class PageTemplateSchema extends ViewSchema {
   @Field()
   @Editor({
     field_type: FieldType.TEXT,

package/src/schemas/SectionSchema.ts

@@ -6,21 +6,13 @@
 
 import { IsOptional, IsString, IsIn } from 'class-validator';
 import 'reflect-metadata';
-import { Editor, Field, Schema, Model, FieldType } from '@qwickapps/schema';
+import { Editor, Field, Schema, FieldType } from '@qwickapps/schema';
 import { ReactNode } from 'react';
+import { ContainerSchema } from './ContainerSchema';
 
 @Schema('Section', '1.0.0')
-export class SectionModel extends Model {
-  @Field()
-  @Editor({
-    field_type: FieldType.TEXTAREA,
-    label: 'Content',
-    description: 'Section content (can be HTML or plain text)',
-    placeholder: 'Enter section content...'
-  })
-  @IsOptional()
-  @IsString()
-  children?: ReactNode | string;
+export class SectionModel extends ContainerSchema {
+  // children field inherited from ContainerSchema
 
   @Field()
   @Editor({

package/src/schemas/SelectInputFieldSchema.ts

@@ -7,7 +7,8 @@
 import { IsArray, IsBoolean, IsOptional, IsString, ValidateNested } from 'class-validator';
 import { Type } from 'class-transformer';
 import 'reflect-metadata';
-import { Editor, Field, Schema, Model, FieldType } from '@qwickapps/schema';
+import { Editor, Field, Schema, FieldType } from '@qwickapps/schema';
+import { ViewSchema } from './ViewSchema';
 
 /**
  * Select option definition for dropdown items
@@ -45,7 +46,7 @@ export class SelectOption {
 }
 
 @Schema('SelectInputField', '1.0.0')
-export class SelectInputFieldModel extends Model {
+export class SelectInputFieldModel extends ViewSchema {
   @Field()
   @Editor({
     field_type: FieldType.TEXT,

package/src/schemas/SwitchInputFieldSchema.ts

@@ -8,13 +8,13 @@ import {
   Schema, 
   Field, 
   Editor, 
-  Model, 
   FieldType 
 } from '@qwickapps/schema';
+import { ViewSchema } from './ViewSchema';
 import { IsOptional, IsString, IsBoolean } from 'class-validator';
 
 @Schema('SwitchInputField', '1.0.0')
-export class SwitchInputFieldModel extends Model {
+export class SwitchInputFieldModel extends ViewSchema {
   @Field()
   @Editor({
     field_type: FieldType.TEXT,

package/src/schemas/TextInputFieldSchema.ts

@@ -6,10 +6,11 @@
 
 import { IsBoolean, IsNumber, IsOptional, IsString } from 'class-validator';
 import 'reflect-metadata';
-import { Editor, Field, Schema, Model, FieldType } from '@qwickapps/schema';
+import { Editor, Field, Schema, FieldType } from '@qwickapps/schema';
+import { ViewSchema } from './ViewSchema';
 
 @Schema('TextInputField', '1.0.0')
-export class TextInputFieldModel extends Model {
+export class TextInputFieldModel extends ViewSchema {
   @Field()
   @Editor({
     field_type: FieldType.TEXT,