Skip to content

tgui: Pandemic issue, tg components #1013

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.

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 1 commit into from
Jun 30, 2024
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 tgui/packages/tgui/components/ProgressBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export const ProgressBar = (props) => {
// We permit colors to be in hex format, rgb()/rgba() format,
// a name for a color-<name> class, or a base CSS class.
const outerProps = computeBoxProps(rest);

const outerClasses = ['ProgressBar', className, computeBoxClassName(rest)];
const fillStyles = {
width: clamp01(scaledValue) * 100 + '%',
Expand All @@ -38,8 +39,7 @@ export const ProgressBar = (props) => {
outerClasses.push('ProgressBar--color--' + effectiveColor);
} else {
// Otherwise, set styles directly.
outerProps.style =
(outerProps.style || '') + `borderClor: ${effectiveColor};`;
outerProps.style = { ...outerProps.style, borderColor: effectiveColor };
fillStyles['backgroundColor'] = effectiveColor;
}

Expand Down
1 change: 1 addition & 0 deletions tgui/packages/tgui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"marked": "^4.3.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tgui-core": "^1.1.2",
"tgui-dev-server": "workspace:*",
"tgui-polyfill": "workspace:*"
}
Expand Down
2 changes: 1 addition & 1 deletion tgui/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"jsx": "preserve",
"lib": ["DOM", "DOM.Iterable", "ESNext", "ScriptHost"],
"module": "ESNext",
"moduleResolution": "Node",
"moduleResolution": "Bundler",
"noEmit": true,
"resolveJsonModule": true,
"skipLibCheck": true,
Expand Down
2 changes: 1 addition & 1 deletion tgui/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module.exports = (env = {}, argv) => {
],
},
{
test: /\.scss$/,
test: /\.(s)?css$/,
use: [
{
loader: ExtractCssPlugin.loader,
Expand Down
11 changes: 11 additions & 0 deletions tgui/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9573,6 +9573,16 @@ __metadata:
languageName: unknown
linkType: soft

"tgui-core@npm:^1.1.2":
version: 1.1.2
resolution: "tgui-core@npm:1.1.2"
peerDependencies:
react: ^18.2.0
react-dom: ^18.2.0
checksum: 10c0/05edc2215daf63bdb126f57aa74e17875784dbe1fadf19f1218dabb17dfffcd63b3c6a1678eb8a5b10b8d325755c1e124f1298350be20af913e9cd0d5a749ec9
languageName: node
linkType: hard

"tgui-dev-server@workspace:*, tgui-dev-server@workspace:packages/tgui-dev-server":
version: 0.0.0-use.local
resolution: "tgui-dev-server@workspace:packages/tgui-dev-server"
Expand Down Expand Up @@ -9667,6 +9677,7 @@ __metadata:
marked: "npm:^4.3.0"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
tgui-core: "npm:^1.1.2"
tgui-dev-server: "workspace:*"
tgui-polyfill: "workspace:*"
languageName: unknown
Expand Down
Loading