handle css control (#427)

UXPin · Oct 17, 2024 · ce4b4c5 · ce4b4c5
1 parent 02e453c
commit ce4b4c5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/packages/uxpin-merge-cli/CHANGELOG.md b/packages/uxpin-merge-cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.4.6] - 2024-10-17
+
+### Added
+
+- Supports css styles with `@uxpincontroltype css`
+
+
 ## [3.4.5] - 2024-09-18
 
 - Improves finding component file based on relative path

diff --git a/packages/uxpin-merge-cli/package.json b/packages/uxpin-merge-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uxpin/merge-cli",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "The Command-line tool integrates the Design System repository with: https://www.uxpin.com/merge",
   "repository": {
     "type": "git",

diff --git a/...merge-cli/src/steps/serialization/component/implementation/ComponentPropertyDefinition.ts b/...merge-cli/src/steps/serialization/component/implementation/ComponentPropertyDefinition.ts
@@ -115,6 +115,7 @@ export interface CustomControlType<T extends CustomControlTypeName = CustomContr
 export enum CustomControlTypeName {
   CodeEditor = 'codeeditor',
   Color = 'color',
+  Css = 'css',
   Input = 'input',
   Image = 'image',
   Interactions = 'interactions',
@@ -127,6 +128,7 @@ export enum CustomControlTypeName {
 export interface CustomControlTypeStructureMap {
   [CustomControlTypeName.CodeEditor]: {};
   [CustomControlTypeName.Color]: {};
+  [CustomControlTypeName.Css]: {};
   [CustomControlTypeName.Input]: {};
   [CustomControlTypeName.Image]: {};
   [CustomControlTypeName.Interactions]: {};

diff --git a/...pin-merge-cli/src/steps/serialization/component/props/parsing/descriptors/parseTypeTag.ts b/...pin-merge-cli/src/steps/serialization/component/props/parsing/descriptors/parseTypeTag.ts
@@ -16,6 +16,7 @@ export function parseTypeTag(value: string): ParseResult {
   switch (typeMatch[0]) {
     case CustomControlTypeName.CodeEditor:
     case CustomControlTypeName.Color:
+    case CustomControlTypeName.Css:
     case CustomControlTypeName.Image:
     case CustomControlTypeName.Input:
     case CustomControlTypeName.Interactions:

diff --git a/...es/uxpin-merge-cli/src/steps/serialization/validation/props/isCustomTypeAllowedForType.ts b/...es/uxpin-merge-cli/src/steps/serialization/validation/props/isCustomTypeAllowedForType.ts
@@ -17,6 +17,7 @@ const CUSTOM_TYPE_ALLOWANCE_MAP: {
 } = {
   [CustomControlTypeName.CodeEditor]: [...ARRAY_TYPES, ...ELEMENT_TYPES, ...OBJECT_TYPES, 'any', 'func', 'string'],
   [CustomControlTypeName.Color]: ['string'],
+  [CustomControlTypeName.Css]: ['object'],
   [CustomControlTypeName.Image]: ['string'],
   [CustomControlTypeName.Input]: TEXT_EDITABLE_TYPES,
   [CustomControlTypeName.Interactions]: ['func'],