Skip to content
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
4 changes: 2 additions & 2 deletions src/components/Dialog/SettingsDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { styled } from 'styletron-react';
import { styled, withStyleDeep } from 'styletron-react';
import { Settings } from '../constants/Settings';
import { StyleProps } from '../../util/style';
import { Dialog } from './Dialog';
Expand Down Expand Up @@ -84,7 +84,7 @@ const SettingInfoText = styled('span', {
userSelect: 'none',
});

const SettingInfoSubtext = styled(SettingInfoText, {
const SettingInfoSubtext = withStyleDeep(SettingInfoText, {
fontSize: '10pt',
});

Expand Down
4 changes: 2 additions & 2 deletions src/components/documentation/EnumerationBrief.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { styled } from 'styletron-react';
import { withStyleDeep } from 'styletron-react';

import EnumerationDocumentation from '../../state/State/Documentation/EnumerationDocumentation';
import { StyleProps } from '../../util/style';
Expand All @@ -15,7 +15,7 @@ export interface EnumerationBriefProps extends StyleProps, ThemeProps {

type Props = EnumerationBriefProps;

const StyledEnumerationName = styled(FileName, ({ theme }: ThemeProps) => ({
const StyledEnumerationName = withStyleDeep(FileName, ({ theme }: ThemeProps) => ({
display: 'block',
marginBottom: `${theme.itemPadding}px`,
':last-child': {
Expand Down
4 changes: 2 additions & 2 deletions src/components/documentation/FileBrief.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { styled } from 'styletron-react';
import { withStyleDeep } from 'styletron-react';

import FileDocumentation from '../../state/State/Documentation/FileDocumentation';
import { StyleProps } from '../../util/style';
Expand All @@ -14,7 +14,7 @@ export interface FileBriefProps extends StyleProps, ThemeProps {

type Props = FileBriefProps;

const StyledFileName = styled(FileName, ({ theme }: ThemeProps) => ({
const StyledFileName = withStyleDeep(FileName, ({ theme }: ThemeProps) => ({
display: 'block',
marginBottom: `${theme.itemPadding}px`,
':last-child': {
Expand Down
4 changes: 2 additions & 2 deletions src/components/documentation/ModuleBrief.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { styled } from 'styletron-react';
import { withStyleDeep } from 'styletron-react';

import ModuleDocumentation from '../../state/State/Documentation/ModuleDocumentation';
import { StyleProps } from '../../util/style';
Expand All @@ -13,7 +13,7 @@ export interface FileBriefProps extends StyleProps, ThemeProps {

type Props = FileBriefProps;

const StyledModuleName = styled(ModuleName, ({ theme }: ThemeProps) => ({
const StyledModuleName = withStyleDeep(ModuleName, ({ theme }: ThemeProps) => ({
display: 'block',
marginBottom: `${theme.itemPadding}px`,
':last-child': {
Expand Down
4 changes: 2 additions & 2 deletions src/components/documentation/RootDocumentation.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { styled } from 'styletron-react';
import { styled, withStyleDeep } from 'styletron-react';
import Dict from '../../util/objectOps/Dict';
import Documentation from '../../state/State/Documentation';
import DocumentationLocation from '../../state/State/Documentation/DocumentationLocation';
Expand Down Expand Up @@ -40,7 +40,7 @@ const Container = styled('div', {
width: '100%',
});

const StyledInput = styled(Input, ({ theme }: ThemeProps) => ({
const StyledInput = withStyleDeep(Input, ({ theme }: ThemeProps) => ({
borderLeft: 'none',
borderRight: 'none',
borderTop: 'none',
Expand Down
4 changes: 2 additions & 2 deletions src/components/documentation/StructureBrief.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { styled } from 'styletron-react';
import { withStyleDeep } from 'styletron-react';

import StructureDocumentation from '../../state/State/Documentation/StructureDocumentation';
import { StyleProps } from '../../util/style';
Expand All @@ -15,7 +15,7 @@ export interface StructureBriefProps extends StyleProps, ThemeProps {

type Props = StructureBriefProps;

const StyledStructureName = styled(FileName, ({ theme }: ThemeProps) => ({
const StyledStructureName = withStyleDeep(FileName, ({ theme }: ThemeProps) => ({
display: 'block',
marginBottom: `${theme.itemPadding}px`,
':last-child': {
Expand Down
2 changes: 1 addition & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const root = createRoot(reactRoot);
root.render(
<StyletronProvider value={engine} debug={debug} debugAfterHydration>
<ReduxProvider store={store}>
<BrowserRouter>
<BrowserRouter future={{ v7_relativeSplatPath: true, v7_startTransition: true }}>
<App />
</BrowserRouter>
</ReduxProvider>
Expand Down
2 changes: 1 addition & 1 deletion src/lms/AssignmentsView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const Container = styled('div', ({ $theme }: { $theme: Theme }) => ({
padding: `${$theme.itemPadding * 2}px`,
}));

const Search = styled(Input, ({ theme }: ThemeProps) => ({
const Search = withStyleDeep(Input, ({ theme }: ThemeProps) => ({
width: '100%',
marginBottom: `${theme.itemPadding * 2}px`,
}));
Expand Down
2 changes: 1 addition & 1 deletion src/lms/plugin/BriefAssignmentsView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const Container = styled('div', ({ $theme }: { $theme: Theme }) => ({
padding: `${$theme.itemPadding * 2}px`,
}));

const Search = styled(Input, ({ theme }: ThemeProps) => ({
const Search = withStyleDeep(Input, ({ theme }: ThemeProps) => ({
width: '100%',
marginBottom: `${theme.itemPadding * 2}px`,
}));
Expand Down
Loading