Skip to content

Commit 6503b5d

Browse files
committed
fix(tile): hide maximize action in fullscreen, reset opacity in drag state
1 parent 48c4ff7 commit 6503b5d

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

src/components/tile-manager/tile-manager.spec.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,22 @@ describe('Tile Manager component', () => {
628628
expect(btnFullscreen.name).equals('fullscreen');
629629
});
630630

631+
it('should hide maximize action when a tile is in fullscreen mode', async () => {
632+
const btnMaximize = getActionButtons(tile)[0];
633+
const btnFullscreen = getActionButtons(tile)[1];
634+
635+
expect(getActionButtons(tile)).lengthOf(2);
636+
expect(btnMaximize.name).equals('expand_content');
637+
expect(btnFullscreen.name).equals('fullscreen');
638+
639+
simulateClick(btnFullscreen);
640+
await elementUpdated(tileManager);
641+
642+
expect(tile.fullscreen).is.true;
643+
expect(getActionButtons(tile)).lengthOf(1);
644+
expect(getActionButtons(tile)[0].name).equals('fullscreen_exit');
645+
});
646+
631647
it('should correctly fire `igcTileMaximize` event on clicking Maximize button', async () => {
632648
const eventSpy = spy(tile, 'emitEvent');
633649
const btnMaximize = getActionButtons(tile)[0];

src/components/tile-manager/tile.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ export default class IgcTileComponent extends EventEmitterMixin<
371371

372372
private _setDragState(state = true) {
373373
this._isDragging = state;
374-
this._tileContent.style.opacity = state ? '0' : '1';
374+
this._tileContent.style.opacity = state ? '0' : '';
375375
this.style.pointerEvents = state ? 'none' : '';
376376
this.part.toggle('dragging', state);
377377
}
@@ -588,7 +588,7 @@ export default class IgcTileComponent extends EventEmitterMixin<
588588
<slot name="title"></slot>
589589
</header>
590590
<section id="tile-actions" part="actions">
591-
${!this.disableMaximize
591+
${!this.disableMaximize && !this.fullscreen
592592
? html`<slot name="maximize-action"
593593
>${this._renderDefaultAction('maximize')}</slot
594594
>`

stories/tile-manager.stories.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ const tiles = Array.from(
150150
(i) => html`
151151
<igc-tile .disableResize=${i === 0}>
152152
<h3 slot="title">Tile ${i + 1} Title</h3>
153-
<igc-icon name="home" slot="actions"></igc-icon>
154153
155154
<p>Text in Tile ${i + 1}</p>
156155
<div class="picture">

0 commit comments

Comments
 (0)