From 4f5d0cc995c75e25f1151891f22c5b102f5de1c0 Mon Sep 17 00:00:00 2001 From: EnixCoda Date: Sun, 29 Mar 2020 15:50:01 +0800 Subject: [PATCH] chore: minor adjustments --- src/content.scss | 3 +++ src/platforms/dummyPlatformForTypeSafety.ts | 13 ++++++------ src/platforms/index.ts | 22 +++++++++++++++------ 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/content.scss b/src/content.scss index 8427ea4..a805950 100644 --- a/src/content.scss +++ b/src/content.scss @@ -199,6 +199,9 @@ $minimal-z-index: max($github-header-z-index, $github-pull-request-float-header- .#{$name}-side-bar { @import '~@primer/css/base/index.scss'; + button { + border-radius: 6px; + } .#{$name}-position-wrapper { position: fixed; diff --git a/src/platforms/dummyPlatformForTypeSafety.ts b/src/platforms/dummyPlatformForTypeSafety.ts index 6d33ceb..57dd469 100644 --- a/src/platforms/dummyPlatformForTypeSafety.ts +++ b/src/platforms/dummyPlatformForTypeSafety.ts @@ -2,16 +2,17 @@ export const dummyPlatformForTypeSafety: Platform = { resolveMeta() { return null }, - getMetaData: callingDummyPlatformMethods, - getTreeData: callingDummyPlatformMethods, + getMetaData: dummyPlatformMethod, + getTreeData: dummyPlatformMethod, shouldShow() { return false }, - getCurrentPath: callingDummyPlatformMethods, - setOAuth: callingDummyPlatformMethods, - useResizeStylesheets: callingDummyPlatformMethods, + getCurrentPath: dummyPlatformMethod, + setOAuth: dummyPlatformMethod, + useResizeStylesheets: dummyPlatformMethod, + getOAuthLink: dummyPlatformMethod, } -function callingDummyPlatformMethods(): any { +function dummyPlatformMethod(): any { throw new Error(`Do not call dummy platform methods`) } diff --git a/src/platforms/index.ts b/src/platforms/index.ts index 8f22bbd..c3b712e 100644 --- a/src/platforms/index.ts +++ b/src/platforms/index.ts @@ -14,13 +14,14 @@ const platformsMap: Record< const CustomDomainsStorageKey = 'CUSTOM_DOMAINS' async function loadCustomDomains() { - const c = await storageHelper.get([CustomDomainsStorageKey]) - if (c) { - const { [CustomDomainsStorageKey]: customDomains } = c + const config = await storageHelper.get([CustomDomainsStorageKey]) + if (config) { + const { [CustomDomainsStorageKey]: customDomains } = config + type CustomDomains = Record // domain -> Platform if (customDomains) { - Object.keys(customDomains).forEach(domain => { - if (domain in platformsMap) { - platformsMap[domain as keyof typeof platformsMap].hosts.push(...customDomains[domain]) + Object.keys(customDomains as CustomDomains).forEach(domain => { + if (customDomains[domain] in platformsMap) { + platformsMap[customDomains[domain] as keyof typeof platformsMap].hosts.push(domain) } }) } @@ -42,6 +43,15 @@ let $platform: Platform = dummyPlatformForTypeSafety export const resolvePlatformP = resolvePlatform() resolvePlatformP.then(platform => ($platform = platform)) +export async function getPlatformName() { + await resolvePlatformP + const keys = Object.keys(platformsMap) as (keyof typeof platformsMap)[] + for (const key of keys) { + const { platform } = platformsMap[key] + if (platform === $platform) return key + } +} + export const platform: Platform = new Proxy(dummyPlatformForTypeSafety, { get(target, key: keyof Platform) { return $platform[key]