Skip to content

Commit f440a1e

Browse files
committed
fixup! feat!: Paragon 23 and External CSS support
1 parent a658f31 commit f440a1e

26 files changed

+357
-774
lines changed

docs/how_tos/theming.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ A complete example, including custom variants:
115115

116116
```js
117117
const siteConfig: SiteConfig = {
118-
paragonThemeUrls: {
118+
theme: {
119119
core: {
120120
url: "https://cdn.jsdelivr.net/npm/@my-org/theme-package@1.0.0/dist/core.min.css",
121121
},

runtime/config/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ let siteConfig: SiteConfig = {
124124
externalRoutes: [],
125125
externalLinkUrlOverrides: [],
126126
mfeConfigApiUrl: null,
127-
paragonThemeUrls: {},
127+
theme: {},
128128
accessTokenCookieName: 'edx-jwt-cookie-header-payload',
129129
csrfTokenApiPath: '/csrf/api/v1/token',
130130
ignoredErrorRegex: null,

runtime/react/SiteProvider.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ import ErrorBoundary from './ErrorBoundary';
1515
import SiteContext from './SiteContext';
1616
import { SELECTED_THEME_VARIANT_KEY } from './constants';
1717
import {
18-
useParagonTheme,
18+
useTheme,
1919
useSiteEvent,
2020
useTrackColorSchemeChoice
2121
} from './hooks';
22-
import { paragonThemeActions } from './reducers';
22+
import { themeActions } from './reducers';
2323

2424
interface SiteProviderProps {
2525
children: ReactNode,
@@ -66,7 +66,7 @@ export default function SiteProvider({ children }: SiteProviderProps) {
6666
});
6767

6868
useTrackColorSchemeChoice();
69-
const [paragonThemeState, paragonThemeDispatch] = useParagonTheme();
69+
const [paragonThemeState, paragonThemeDispatch] = useTheme();
7070

7171
const siteContextValue = useMemo(() => ({
7272
authenticatedUser,
@@ -75,7 +75,7 @@ export default function SiteProvider({ children }: SiteProviderProps) {
7575
paragonTheme: {
7676
state: paragonThemeState,
7777
setThemeVariant: (themeVariant: string) => {
78-
paragonThemeDispatch(paragonThemeActions.setParagonThemeVariant(themeVariant));
78+
paragonThemeDispatch(themeActions.setThemeVariant(themeVariant));
7979

8080
// Persist selected theme variant to localStorage.
8181
window.localStorage.setItem(SELECTED_THEME_VARIANT_KEY, themeVariant);

runtime/react/hooks/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ export { default as useActiveRouteRoleWatcher } from './useActiveRouteRoleWatche
44
export { default as useActiveRoles } from './useActiveRoles';
55
export { default as useSiteConfig } from './useSiteConfig';
66
export { default as useSiteEvent } from './useSiteEvent';
7-
export { default as useTrackColorSchemeChoice } from './useTrackColorSchemeChoice';
87

9-
export * from './paragon';
8+
export * from './theme';

runtime/react/hooks/paragon/useParagonThemeCore.test.ts

Lines changed: 0 additions & 96 deletions
This file was deleted.

runtime/react/hooks/paragon/useParagonThemeCore.ts

Lines changed: 0 additions & 56 deletions
This file was deleted.

runtime/react/hooks/paragon/useParagonThemeUrls.test.ts

Lines changed: 0 additions & 99 deletions
This file was deleted.

runtime/react/hooks/paragon/useParagonThemeUrls.ts

Lines changed: 0 additions & 51 deletions
This file was deleted.

runtime/react/hooks/paragon/useTrackColorSchemeChoice.ts

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)