Merge pull request #28 from movie-web/fix/#1047

fix ts error, fix styling on PermissionRequest
This commit is contained in:
William Oldham
2024-03-28 20:33:24 +00:00
committed by GitHub
3 changed files with 7 additions and 3 deletions

View File

@@ -23,9 +23,9 @@ export function useDomainWhitelist() {
}; };
} }
export function useToggleWhitelistDomain(domain: string) { export function useToggleWhitelistDomain(domain: string | null) {
const { domainWhitelist, addDomain, removeDomain } = useDomainWhitelist(); const { domainWhitelist, addDomain, removeDomain } = useDomainWhitelist();
const isWhitelisted = domainWhitelist.includes(domain); const isWhitelisted = domainWhitelist.includes(domain ?? '');
const { grantPermission } = usePermission(); const { grantPermission } = usePermission();
const iconPath = (chrome || browser).runtime.getURL(isWhitelisted ? 'assets/active.png' : 'assets/inactive.png'); const iconPath = (chrome || browser).runtime.getURL(isWhitelisted ? 'assets/active.png' : 'assets/inactive.png');

View File

@@ -28,7 +28,7 @@ function IndexPopup() {
) : ( ) : (
<Frame> <Frame>
<div className="popup"> <div className="popup">
{page === 'toggle' ? <ToggleButton active={isWhitelisted} onClick={toggle} domain={domain} /> : null} {page === 'toggle' && domain ? <ToggleButton active={isWhitelisted} onClick={toggle} domain={domain} /> : null}
{page === 'disabled' ? <DisabledScreen /> : null} {page === 'disabled' ? <DisabledScreen /> : null}
<BottomLabel /> <BottomLabel />
</div> </div>

View File

@@ -10,6 +10,10 @@ body {
padding-bottom: 50px; padding-bottom: 50px;
} }
#__plasmo {
height: unset;
}
.permission-request.container { .permission-request.container {
width: 90%; width: 90%;
margin: 100px auto; margin: 100px auto;