chore: fix block migration (#9996)

taiga-family · Dec 23, 2024 · fb3bf1d · fb3bf1d
1 parent 552d97e
commit fb3bf1d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -13,7 +13,9 @@
         "significand",
         "undoubtable",
         "Clintock",
-        "Bonorum"
+        "Bonorum",
+        "hidecheckbox",
+        "hideradio"
     ],
     "ignoreRegExpList": ["\\(https?://.*?\\)", "\\/{1}.+\\/{1}", "\\%2F.+", "\\%2C.+", "\\ɵ.+", "\\ыва.+"],
     "overrides": [

diff --git a/projects/cdk/schematics/ng-update/v4/steps/constants/tags-to-replace.ts b/projects/cdk/schematics/ng-update/v4/steps/constants/tags-to-replace.ts
@@ -31,15 +31,29 @@ export const TAGS_TO_REPLACE: ReplacementTag[] = [
         to: 'input',
         addAttributes: ['tuiRadio', 'type="radio"'],
     },
+    {
+        from: 'tui-checkbox-block',
+        to: 'input',
+        addAttributes: ['tuiCheckbox', 'type="checkbox"', 'tuiBlock'],
+        filterFn: (el) => el.attrs.some((attr) => attr.name === '[hidecheckbox]'),
+    },
     {
         from: 'tui-checkbox-block',
         to: 'input',
         addAttributes: ['tuiCheckbox', 'type="checkbox"'],
+        filterFn: (el) => !el.attrs.some((attr) => attr.name === '[hidecheckbox]'),
+    },
+    {
+        from: 'tui-radio-block',
+        to: 'input',
+        addAttributes: ['tuiRadio', 'type="radio"', 'tuiBlock'],
+        filterFn: (el) => el.attrs.some((attr) => attr.name === '[hideradio]'),
     },
     {
         from: 'tui-radio-block',
         to: 'input',
         addAttributes: ['tuiRadio', 'type="radio"'],
+        filterFn: (el) => !el.attrs.some((attr) => attr.name === '[hideradio]'),
     },
     {
         from: 'tui-hosted-dropdown',

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
@@ -112,7 +112,7 @@ const TEMPLATE_AFTER = `
   </label>
 </form>
 <label *ngFor="let block of blocks" tuiBlock="m" appearance="">
-<input tuiCheckbox type="checkbox"
+<input tuiCheckbox type="checkbox" tuiBlock
   ${''}
   ${''}
   ${''}
@@ -122,15 +122,15 @@ const TEMPLATE_AFTER = `
   {{ block.name }}
 </label>
 <label tuiBlock="s" appearance="">
-<input tuiCheckbox type="checkbox"
+<input tuiCheckbox type="checkbox" tuiBlock
     formControlName="testValue3"
     ${''}
     ${''}
 >
     Pineapples
 </label>
 <label tuiBlock="l" appearance="">
-<input tuiRadio type="radio"
+<input tuiRadio type="radio" tuiBlock
     formControlName="testValue"
     ${''}
     ${''}