chore(schematics): valid migration for tuiBlock (#10132)

taiga-family · Jan 13, 2025 · be5fef1 · be5fef1
1 parent 1b3d68e
commit be5fef1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/projects/cdk/schematics/ng-update/v4/steps/templates/migrate-blocked.ts b/projects/cdk/schematics/ng-update/v4/steps/templates/migrate-blocked.ts
@@ -3,7 +3,7 @@ import type {DevkitFileSystem} from 'ng-morph';
 import type {Location} from 'parse5/dist/common/token';
 
 import {findElementsByTagNames} from '../../../../utils/templates/elements';
-import {findAttr} from '../../../../utils/templates/inputs';
+import {findAttr, isBinding} from '../../../../utils/templates/inputs';
 import {
     getTemplateFromTemplateResource,
     getTemplateOffset,
@@ -53,8 +53,8 @@ export function migrateBlocked({
             ) || [];
         const sizeAttr = findAttr(attrs, 'size');
         const ngForAttr = findAttr(attrs, '*ngFor');
-
-        const newBlockAttr = `tuiBlock${sizeAttr ? `="${sizeAttr.value === 'xs' ? 's' : sizeAttr.value}"` : ''}`;
+        const tuiBlock = sizeAttr && isBinding(sizeAttr) ? '[tuiBlock]' : 'tuiBlock';
+        const newBlockAttr = `${tuiBlock}${sizeAttr ? `="${sizeAttr.value === 'xs' ? 's' : sizeAttr.value}"` : ''}`;
 
         recorder.insertRight(
             templateOffset + (sourceCodeLocation.startTag?.startOffset || 1) - 1,

diff --git a/projects/cdk/schematics/ng-update/v4/tests/schematic-migrate-blocked.spec.ts b/projects/cdk/schematics/ng-update/v4/tests/schematic-migrate-blocked.spec.ts
@@ -88,6 +88,10 @@ const TEMPLATE_BEFORE = `
 </tui-radio-block>
 
 <tui-primitive-textfield [(value)]="value" [pseudoFocus]="pseudoFocus">Type something</tui-primitive-textfield>
+
+<tui-checkbox-block [formControl]="control" [size]="size">
+    {{ label() }}
+</tui-checkbox-block>
 `.trim();
 
 const TEMPLATE_AFTER = `
@@ -142,6 +146,10 @@ const TEMPLATE_AFTER = `
 </label>
 
 <tui-primitive-textfield [(value)]="value" [pseudoFocus]="pseudoFocus">Type something</tui-primitive-textfield>
+<label [tuiBlock]="size">
+<input tuiCheckbox type="checkbox" [formControl]="control" >
+    {{ label() }}
+</label>
 `.trim();
 
 describe('ng-update', () => {