fix(affix,anchor): wrong value is set when the initial value is non-n…

…umber (#5277)
NG-ZORRO · May 14, 2020 · 1c72939 · 1c72939
1 parent bac4bc4
commit 1c72939
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/components/affix/affix.component.ts b/components/affix/affix.component.ts
@@ -57,18 +57,17 @@ export class NzAffixComponent implements AfterViewInit, OnChanges, OnDestroy {
 
   @ViewChild('fixedEl', { static: true }) private fixedEl!: ElementRef<HTMLDivElement>;
 
-  // TODO@hsuanxyz SSR breaks (perhaps)?
-  @Input() nzTarget: string | Element | Window = window;
+  @Input() nzTarget?: string | Element | Window;
 
   @Input()
   @WithConfig<number | null>(NZ_CONFIG_COMPONENT_NAME)
-  @InputNumber()
-  nzOffsetTop: null | number = null;
+  @InputNumber(undefined)
+  nzOffsetTop?: null | number;
 
   @Input()
   @WithConfig<number | null>(NZ_CONFIG_COMPONENT_NAME)
-  @InputNumber()
-  nzOffsetBottom: null | number = null;
+  @InputNumber(undefined)
+  nzOffsetBottom?: null | number;
 
   @Output() readonly nzChange = new EventEmitter<boolean>();
 

diff --git a/components/affix/affix.spec.ts b/components/affix/affix.spec.ts
@@ -215,7 +215,8 @@ describe('affix', () => {
     });
 
     it('recreate bug https://github.com/NG-ZORRO/ng-zorro-antd/issues/868', fakeAsync(() => {
-      context.newOffset = offsetTop.toString();
+      // tslint:disable-next-line:no-any
+      context.newOffset = offsetTop.toString() as any;
       setupInitialState({ offsetTop: offsetTop + 1 });
       emitScroll(window, 2);
 
@@ -503,6 +504,6 @@ describe('affix-extra', () => {
 class TestAffixComponent {
   @ViewChild(NzAffixComponent, { static: true }) nzAffixComponent!: NzAffixComponent;
   fakeTarget: string | Element | Window | null = null;
-  newOffset: {} = {};
-  newOffsetBottom: {} = {};
+  newOffset!: number;
+  newOffsetBottom!: number;
 }
diff --git a/components/anchor/anchor.component.ts b/components/anchor/anchor.component.ts
@@ -88,7 +88,7 @@ export class NzAnchorComponent implements OnDestroy, AfterViewInit, OnChanges {
   nzBounds: number = 5;
 
   @Input()
-  @InputNumber()
+  @InputNumber(undefined)
   @WithConfig<number>(NZ_CONFIG_COMPONENT_NAME)
   nzOffsetTop?: number = undefined;
 

diff --git a/components/core/util/convert.ts b/components/core/util/convert.ts
@@ -87,6 +87,6 @@ export function InputCssPixel(): NzSafeAny {
   return propDecoratorFactory('InputCssPixel', toCssPixel);
 }
 
-export function InputNumber(): NzSafeAny {
-  return propDecoratorFactory('InputNumber', toNumber);
+export function InputNumber(fallbackValue?: NzSafeAny): NzSafeAny {
+  return propDecoratorFactory('InputNumber', (value: string | number) => toNumber(value, fallbackValue));
 }