Skip to content
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

Fix: Migrating every theme to TypeScript. #2474

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fix: Migrating every theme to TypeScript. #2474

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8275312
Dark theme to typescript
tgbhy Dec 30, 2024
ae44edc
Theme deuteranopia to typescript
tgbhy Dec 30, 2024
a299875
Theme hackermode to typescript
tgbhy Dec 30, 2024
075bb55
Theme highcontrast to typescript
tgbhy Dec 30, 2024
d302ee5
Theme modern to typescript
tgbhy Dec 30, 2024
bc87084
Theme tritanopia to typescript
tgbhy Dec 30, 2024
3c49ad6
Make eslink happy + Prettier on every theme :p
tgbhy Jan 18, 2025
e11cf4c
fix: Removed all self-dependcies
tgbhy Jan 24, 2025
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
7,802 changes: 6,965 additions & 837 deletions plugins/theme-dark/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions plugins/theme-dark/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,8 @@
},
"engines": {
"node": ">=8.17.0"
},
"dependencies": {
"@blockly/theme-dark": "file:"
}
}
4 changes: 2 additions & 2 deletions plugins/theme-dark/src/index.js → plugins/theme-dark/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ import * as Blockly from 'blockly/core';
* Dark theme.
*/
export default Blockly.Theme.defineTheme('dark', {
name: 'dark',
base: Blockly.Themes.Classic,
componentStyles: {
workspaceBackgroundColour: '#1e1e1e',
toolboxBackgroundColour: 'blackBackground',
toolboxBackgroundColour: '#333',
toolboxForegroundColour: '#fff',
flyoutBackgroundColour: '#252526',
flyoutForegroundColour: '#ccc',
Expand All @@ -27,6 +28,5 @@ export default Blockly.Theme.defineTheme('dark', {
insertionMarkerOpacity: 0.3,
scrollbarOpacity: 0.4,
cursorColour: '#d0d0d0',
blackBackground: '#333',
},
});
16 changes: 16 additions & 0 deletions plugins/theme-dark/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"compilerOptions": {
"baseUrl": "./",
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"module": "es2015",
"moduleResolution": "bundler",
"target": "es6",
"strict": true
},
// NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
// Only src matters for production builds.
"include": ["src"]
}
7,802 changes: 6,965 additions & 837 deletions plugins/theme-deuteranopia/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions plugins/theme-deuteranopia/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,8 @@
},
"engines": {
"node": ">=8.17.0"
},
"dependencies": {
"@blockly/theme-deuteranopia": "file:"
tgbhy marked this conversation as resolved.
Show resolved Hide resolved
}
}
39 changes: 20 additions & 19 deletions plugins/theme-deuteranopia/src/index.js → plugins/theme-deuteranopia/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,79 +11,79 @@
import * as Blockly from 'blockly/core';

const defaultBlockStyles = {
colour_blocks: {
colourBlocks: {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, renaming these properties will break the theme. This is one case where you have suppress the eslint errors, rather than changing the code so there isn't an error:

Suggested change
colourBlocks: {
colour_blocks: { // eslint-disable-line camelcase

(Here and many other places in this PR.)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't seems to destroy the theme for me after my tests

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So tell me if you want me to do it but the one or the other isn't breaking so...

colourPrimary: '#f2a72c',
colourSecondary: '#f1c172',
colourTertiary: '#da921c',
},
list_blocks: {
listBlocks: {
colourPrimary: '#7d65ab',
colourSecondary: '#a88be0',
colourTertiary: '#66518e',
},
logic_blocks: {
logicBlocks: {
colourPrimary: '#9fd2f1',
colourSecondary: '#c0e0f4',
colourTertiary: '#74bae5',
},
loop_blocks: {
loopBlocks: {
colourPrimary: '#795a07',
colourSecondary: '#ac8726',
colourTertiary: '#c4a03f',
},
math_blocks: {
mathBlocks: {
colourPrimary: '#e6da39',
colourSecondary: '#f3ec8e',
colourTertiary: '#f2eeb7',
},
procedure_blocks: {
procedureBlocks: {
colourPrimary: '#590721',
colourSecondary: '#8c475d',
colourTertiary: '#885464',
},
text_blocks: {
textBlocks: {
colourPrimary: '#058863',
colourSecondary: '#5ecfaf',
colourTertiary: '#04684c',
},
variable_blocks: {
variableBlocks: {
colourPrimary: '#47025a',
colourSecondary: '#820fa1',
colourTertiary: '#8e579d',
},
variable_dynamic_blocks: {
variableDynamicBlocks: {
colourPrimary: '#47025a',
colourSecondary: '#820fa1',
colourTertiary: '#8e579d',
},
};

const categoryStyles = {
colour_category: {
colourCategory: {
colour: '#f2a72c',
},
list_category: {
listCategory: {
colour: '#7d65ab',
},
logic_category: {
logicCategory: {
colour: '#9fd2f1',
},
loop_category: {
loopCategory: {
colour: '#795a07',
},
math_category: {
mathCategory: {
colour: '#e6da39',
},
procedure_category: {
procedureCategory: {
colour: '#590721',
},
text_category: {
textCategory: {
colour: '#058863',
},
variable_category: {
variableCategory: {
colour: '#47025a',
},
variable_dynamic_category: {
variableDynamicCategory: {
colour: '#47025a',
},
};
Expand All @@ -95,10 +95,11 @@ const categoryStyles = {
* inability to perceive red light).
*/
export default Blockly.Theme.defineTheme('deuteranopia', {
name: 'deuteranopia',
base: Blockly.Themes.Classic,
blockStyles: defaultBlockStyles,
categoryStyles: categoryStyles,
componentStyles: {},
fontStyle: {},
startHats: null,
startHats: undefined,
});
16 changes: 16 additions & 0 deletions plugins/theme-deuteranopia/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"compilerOptions": {
"baseUrl": "./",
"outDir": "dist",
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"module": "es2015",
"moduleResolution": "bundler",
"target": "es6",
"strict": true
},
// NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
// Only src matters for production builds.
"include": ["src"]
}
Loading
Loading