Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make SSR compatible #367

Merged
merged 1 commit into from
Feb 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/lib/picker/emoji-frequently.service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
import { isPlatformBrowser } from '@angular/common';
import { Inject, Injectable, PLATFORM_ID } from '@angular/core';

import { EmojiData } from '@ctrl/ngx-emoji-mart/ngx-emoji';

Expand Down Expand Up @@ -26,9 +27,13 @@ export class EmojiFrequentlyService {
'heart',
'poop',
];

constructor(@Inject(PLATFORM_ID) private platformId: string) {}
init() {
this.frequently = JSON.parse(localStorage.getItem(`${this.NAMESPACE}.frequently`) || 'null');
this.frequently = JSON.parse(
(isPlatformBrowser(this.platformId) &&
localStorage.getItem(`${this.NAMESPACE}.frequently`)) ||
'null',
);
this.initialized = true;
}
add(emoji: EmojiData) {
Expand All @@ -43,8 +48,10 @@ export class EmojiFrequentlyService {
}
this.frequently[emoji.id] += 1;

localStorage.setItem(`${this.NAMESPACE}.last`, emoji.id);
localStorage.setItem(`${this.NAMESPACE}.frequently`, JSON.stringify(this.frequently));
if (isPlatformBrowser(this.platformId)) {
localStorage.setItem(`${this.NAMESPACE}.last`, emoji.id);
localStorage.setItem(`${this.NAMESPACE}.frequently`, JSON.stringify(this.frequently));
}
}
get(perLine: number, totalLines: number) {
if (!this.initialized) {
Expand All @@ -69,7 +76,8 @@ export class EmojiFrequentlyService {
.reverse();
const sliced = sorted.slice(0, quantity);

const last = localStorage.getItem(`${this.NAMESPACE}.last`);
const last =
isPlatformBrowser(this.platformId) && localStorage.getItem(`${this.NAMESPACE}.last`);

if (last && !sliced.includes(last)) {
sliced.pop();
Expand Down
28 changes: 17 additions & 11 deletions src/lib/picker/picker.component.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import { isPlatformBrowser } from '@angular/common';
import {
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
ElementRef,
EventEmitter,
Inject,
Input,
NgZone,
OnDestroy,
OnInit,
Output,
PLATFORM_ID,
QueryList,
Renderer2,
ViewChild,
Expand All @@ -29,8 +32,6 @@ import { SearchComponent } from './search.component';
import * as icons from './svgs';
import { measureScrollbar } from './utils';



const I18N: any = {
search: 'Search',
emojilist: 'List of emoji',
Expand Down Expand Up @@ -151,6 +152,7 @@ export class PickerComponent implements OnInit, OnDestroy {
private renderer: Renderer2,
private ref: ChangeDetectorRef,
private frequently: EmojiFrequentlyService,
@Inject(PLATFORM_ID) private platformId: string,
) {}

ngOnInit() {
Expand All @@ -160,8 +162,10 @@ export class PickerComponent implements OnInit, OnDestroy {
this.i18n = { ...I18N, ...this.i18n };
this.i18n.categories = { ...I18N.categories, ...this.i18n.categories };
this.skin =
JSON.parse(localStorage.getItem(`${this.NAMESPACE}.skin`) || 'null') ||
this.skin;
JSON.parse(
(isPlatformBrowser(this.platformId) && localStorage.getItem(`${this.NAMESPACE}.skin`)) ||
'null',
) || this.skin;

const allCategories = [...categories];

Expand Down Expand Up @@ -266,14 +270,16 @@ export class PickerComponent implements OnInit, OnDestroy {
// component and going down to the children.
this.ref.detectChanges();

this.ngZone.runOutsideAngular(() => {
// The `updateCategoriesSize` doesn't change properties that are used
// in templates, thus this is run in the context of the root zone to avoid
// running change detection.
requestAnimationFrame(() => {
this.updateCategoriesSize();
// tslint:disable-next-line: no-unused-expression
isPlatformBrowser(this.platformId) &&
this.ngZone.runOutsideAngular(() => {
// The `updateCategoriesSize` doesn't change properties that are used
// in templates, thus this is run in the context of the root zone to avoid
// running change detection.
requestAnimationFrame(() => {
this.updateCategoriesSize();
});
});
});
});

this.ngZone.runOutsideAngular(() => {
Expand Down