Revert "fix(show-hide): use initial value as fallback instead of pare…

…nt (#1243)" This reverts commit bf2355b.
angular · May 13, 2020 · 80fdd80 · 80fdd80
1 parent 942c507
commit 80fdd80
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/src/lib/extended/show-hide/show-hide.ts b/src/lib/extended/show-hide/show-hide.ts
@@ -36,7 +36,7 @@ export interface ShowHideParent {
 export class ShowHideStyleBuilder extends StyleBuilder {
   buildStyles(show: string, parent: ShowHideParent) {
     const shouldShow = show === 'true';
-    return {'display': shouldShow ? parent.display || 'initial' : 'none'};
+    return {'display': shouldShow ? parent.display : 'none'};
   }
 }
 

diff --git a/src/lib/extended/show-hide/show.spec.ts b/src/lib/extended/show-hide/show.spec.ts
@@ -5,8 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {Component, Directive, OnInit} from '@angular/core';
-import {CommonModule} from '@angular/common';
+import {Component, Directive, OnInit, PLATFORM_ID} from '@angular/core';
+import {CommonModule, isPlatformBrowser} from '@angular/common';
 import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {
   ɵMatchMedia as MatchMedia,
@@ -35,15 +35,17 @@ describe('show directive', () => {
   let fixture: ComponentFixture<any>;
   let mediaController: MockMatchMedia;
   let styler: StyleUtils;
+  let platformId: Object;
   let createTestComponent = (template: string) => {
     fixture = makeCreateTestComponent(() => TestShowComponent)(template);
 
     // Can only Inject() AFTER TestBed.override(...)
     inject(
-        [MatchMedia, StyleUtils],
-        (_matchMedia: MockMatchMedia, _styler: StyleUtils) => {
+        [MatchMedia, StyleUtils, PLATFORM_ID],
+        (_matchMedia: MockMatchMedia, _styler: StyleUtils, _platformId: Object) => {
        mediaController = _matchMedia;
        styler = _styler;
+       platformId = _platformId;
     })();
 
     return fixture;
@@ -292,9 +294,15 @@ describe('show directive', () => {
       fixture.detectChanges();
 
       // NOTE: platform-server can't compute display for unknown elements
-      expectEl(queryFor(fixture, elSelector)[0]).toHaveCSS({
-        'display': 'initial'
-      }, styler);
+      if (isPlatformBrowser(platformId)) {
+        expectEl(queryFor(fixture, elSelector)[0]).toHaveCSS({
+          'display': 'inline'
+        }, styler);
+      } else {
+        expectEl(queryFor(fixture, elSelector)[0]).not.toHaveStyle({
+          'display': '*'
+        }, styler);
+      }
 
       mediaController.activate('xs');
       fixture.detectChanges();
@@ -305,9 +313,15 @@ describe('show directive', () => {
       mediaController.activate('lg');
       fixture.detectChanges();
       // NOTE: platform-server can't compute display for unknown elements
-      expectEl(queryFor(fixture, elSelector)[0]).toHaveCSS({
-        'display': 'initial'
-      }, styler);
+      if (isPlatformBrowser(platformId)) {
+        expectEl(queryFor(fixture, elSelector)[0]).toHaveCSS({
+          'display': 'inline'
+        }, styler);
+      } else {
+        expectEl(queryFor(fixture, elSelector)[0]).not.toHaveStyle({
+          'display': '*'
+        }, styler);
+      }
     });
   });