Skip to content

chore(website): simplify playground logic #8686

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Jun 3, 2024
Merged

chore(website): simplify playground logic #8686

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f43f12
begin simplification
abrahamguo Mar 16, 2024
8fdad78
Merge branch 'main' of github.com:abrahamguo/typescript-eslint into p…
abrahamguo Mar 16, 2024
e31647f
remove unnecessary checks
abrahamguo Mar 16, 2024
81bd05a
Revert "remove unnecessary checks"
abrahamguo Mar 16, 2024
3d57740
Merge branch 'main' of github.com:abrahamguo/typescript-eslint into p…
abrahamguo Jun 3, 2024
576e995
extract hook calls
abrahamguo Jun 3, 2024
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
104 changes: 48 additions & 56 deletions packages/website/src/components/Playground.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
// See https://github.com/typescript-eslint/typescript-eslint/issues/7630.
/* eslint-disable @typescript-eslint/no-unnecessary-condition */
import { useWindowSize } from '@docusaurus/theme-common';
import clsx from 'clsx';
import React, { useCallback, useEffect, useRef, useState } from 'react';
import React, {
useCallback,
useEffect,
useMemo,
useRef,
useState,
} from 'react';
import type { ImperativePanelHandle } from 'react-resizable-panels';
import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels';

Expand All @@ -29,7 +33,7 @@ function Playground(): React.JSX.Element {
const [astModel, setAstModel] = useState<UpdateModel>();
const [markers, setMarkers] = useState<ErrorGroup[]>();
const [ruleNames, setRuleNames] = useState<RuleDetails[]>([]);
const [isLoading, setIsLoading] = useState<boolean>(true);
const [isLoading, setIsLoading] = useState(true);
const [tsVersions, setTSVersion] = useState<readonly string[]>([]);
const [selectedRange, setSelectedRange] = useState<SelectedRange>();
const [position, setPosition] = useState<number>();
Expand All @@ -38,31 +42,34 @@ function Playground(): React.JSX.Element {
const [visualEslintRc, setVisualEslintRc] = useState(false);
const [visualTSConfig, setVisualTSConfig] = useState(false);
const playgroundMenuRef = useRef<ImperativePanelHandle>(null);
const [optionsSize] = useState(() => {
return Math.round(
(parseFloat(getComputedStyle(document.documentElement).fontSize) * 2000) /
window.innerWidth,
);
});
const optionsSize = useMemo(
() =>
Math.round(
(parseFloat(getComputedStyle(document.documentElement).fontSize) *
2000) /
innerWidth,
),
[],
);

const onLoaded = useCallback(
(ruleNames: RuleDetails[], tsVersions: readonly string[]): void => {
(ruleNames: RuleDetails[], tsVersions: readonly string[]) => {
setRuleNames(ruleNames);
setTSVersion(tsVersions);
setIsLoading(false);
},
[],
);

const activeVisualEditor = !isLoading
? visualEslintRc && activeTab === 'eslintrc'
? 'eslintrc'
: visualTSConfig && activeTab === 'tsconfig'
? 'tsconfig'
: undefined
: undefined;
const ActiveVisualEditor =
!isLoading &&
{
code: undefined,
eslintrc: visualEslintRc && ConfigEslint,
tsconfig: visualTSConfig && ConfigTypeScript,
}[activeTab];

const onVisualEditor = useCallback((tab: TabType): void => {
const onVisualEditor = useCallback((tab: TabType) => {
if (tab === 'tsconfig') {
setVisualTSConfig(val => !val);
} else if (tab === 'eslintrc') {
Expand Down Expand Up @@ -117,39 +124,26 @@ function Playground(): React.JSX.Element {
showVisualEditor={activeTab !== 'code'}
showModal={onVisualEditor}
/>
{(activeVisualEditor === 'eslintrc' && (
<ConfigEslint
{ActiveVisualEditor && (
<ActiveVisualEditor
className={styles.tabCode}
ruleOptions={ruleNames}
config={state.eslintrc}
config={state[activeTab]}
onChange={setState}
/>
)) ||
(activeVisualEditor === 'tsconfig' && (
<ConfigTypeScript
className={styles.tabCode}
config={state.tsconfig}
onChange={setState}
/>
))}
)}
<div
key="monacoEditor"
className={clsx(
styles.tabCode,
!!activeVisualEditor && styles.hidden,
ActiveVisualEditor && styles.hidden,
)}
>
<EditorEmbed />
</div>
<LoadingEditor
ts={state.ts}
fileType={state.fileType}
{...state}
activeTab={activeTab}
code={state.code}
tsconfig={state.tsconfig}
eslintrc={state.eslintrc}
sourceType={state.sourceType}
showAST={state.showAST}
onASTChange={setAstModel}
onMarkersChange={setMarkers}
selectedRange={selectedRange}
Expand All @@ -168,7 +162,7 @@ function Playground(): React.JSX.Element {
<EditorTabs
tabs={detailTabs}
active={state.showAST ?? false}
change={(v): void => setState({ showAST: v })}
change={showAST => setState({ showAST })}
additionalTabsInfo={{
Errors:
markers?.reduce((prev, cur) => prev + cur.items.length, 0) ||
Expand All @@ -179,51 +173,49 @@ function Playground(): React.JSX.Element {
<ESQueryFilter
defaultValue={state.esQuery?.filter}
onChange={(filter, selector) =>
setState({
esQuery: { filter, selector },
})
setState({ esQuery: { filter, selector } })
}
onError={setEsQueryError}
/>
)}
</div>
<div className={styles.playgroundInfoContainer}>
{(state.showAST === 'es' && esQueryError && (
{state.showAST === 'es' && esQueryError ? (
<ErrorViewer
type="warning"
title="Invalid Selector"
value={esQueryError}
/>
)) ||
(state.showAST === 'types' && astModel?.storedTsAST && (
) : state.showAST && astModel ? (
state.showAST === 'types' && astModel.storedTsAST ? (
<TypesDetails
typeChecker={astModel.typeChecker}
value={astModel.storedTsAST}
onHoverNode={setSelectedRange}
cursorPosition={position}
/>
)) ||
(state.showAST && astModel && (
) : (
<ASTViewer
key={String(state.showAST)}
key={state.showAST}
filter={
state.showAST === 'es' ? state.esQuery?.selector : undefined
}
value={
state.showAST === 'ts'
? astModel.storedTsAST
: state.showAST === 'scope'
? astModel.storedScope
: state.showAST === 'es'
? astModel.storedAST
: undefined
state.showAST === 'types'
? undefined
: astModel[
`stored${({ ts: 'TsAST', scope: 'Scope', es: 'AST' } as const)[state.showAST]}` as const
]
}
showTokens={state.showTokens}
enableScrolling={state.scroll}
cursorPosition={position}
onHoverNode={setSelectedRange}
/>
)) || <ErrorsViewer value={markers} />}
)
) : (
<ErrorsViewer value={markers} />
)}
</div>
</Panel>
</PanelGroup>
Expand Down