FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

follow-up fixes after renaming visible prop to hidden · bcdev/chartlets@8613f75 · GitHub

/ chartlets Public

Commit 8613f75

Browse files
clarasb
committed
follow-up fixes after renaming visible prop to hidden
1 parent 3f696fd commit 8613f75

8 files changed

Lines changed: 34 additions & 30 deletions

File tree

‎chartlets.js/packages/lib/src/actions/helpers/invokeCallbacks.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ describe("invokeCallbacks", () => {
5454
{
5555
type: "CircularProgress",
5656
id: "progress",
57-
hidden: false,
57+
hidden: true,
5858
},
5959
],
6060
},
@@ -83,20 +83,20 @@ describe("invokeCallbacks", () => {
8383

8484
invokeCallbacks([callbackRequest]);
8585

86-
expect(getProgressComponent().hidden).toBe(true);
86+
expect(getProgressComponent().hidden).toBe(false);
8787

8888
deferred.resolve(
8989
createCallbackResponse([
9090
{
9191
contribPoint: "panels",
9292
contribIndex: 0,
93-
stateChanges: [{ id: "progress", property: "hidden", value: false }],
93+
stateChanges: [{ id: "progress", property: "hidden", value: true }],
9494
},
9595
]),
9696
);
9797

9898
await vi.waitFor(() => {
99-
expect(getProgressComponent().hidden).toBe(false);
99+
expect(getProgressComponent().hidden).toBe(true);
100100
});
101101
});
102102

@@ -109,7 +109,7 @@ describe("invokeCallbacks", () => {
109109

110110
invokeCallbacks([callbackRequest]);
111111

112-
expect(getProgressComponent().hidden).toBe(true);
112+
expect(getProgressComponent().hidden).toBe(false);
113113

114114
deferred.resolve({
115115
ok: true,
@@ -119,7 +119,7 @@ describe("invokeCallbacks", () => {
119119
} as unknown as Response);
120120

121121
await vi.waitFor(() => {
122-
expect(getProgressComponent().hidden).toBe(false);
122+
expect(getProgressComponent().hidden).toBe(true);
123123
});
124124
expect(consoleError).toHaveBeenCalledOnce();
125125
});

‎chartlets.js/packages/lib/src/actions/helpers/pendingProgress.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ describe("pendingProgress", () => {
4747
{
4848
type: "CircularProgress",
4949
id: "progress",
50-
hidden: false,
50+
hidden: true,
5151
},
5252
{
5353
type: "Typography",
5454
id: "text",
55-
hidden: false,
55+
hidden: true,
5656
},
5757
],
5858
},
@@ -137,25 +137,25 @@ describe("pendingProgress", () => {
137137

138138
showPendingProgressTargets(targets);
139139

140-
expect(getProgressComponent().hidden).toBe(true);
140+
expect(getProgressComponent().hidden).toBe(false);
141141

142142
releasePendingProgressTargets(targets, false);
143143

144-
expect(getProgressComponent().hidden).toBe(false);
144+
expect(getProgressComponent().hidden).toBe(true);
145145
});
146146

147-
it("keeps progress hidden until overlapping callbacks have completed", () => {
147+
it("keeps progress visible until overlapping callbacks have completed", () => {
148148
const targets = getPendingProgressTargets([callbackRequest]);
149149

150150
showPendingProgressTargets(targets);
151151
showPendingProgressTargets(targets);
152152

153153
releasePendingProgressTargets(targets, true);
154154

155-
expect(getProgressComponent().hidden).toBe(true);
155+
expect(getProgressComponent().hidden).toBe(false);
156156

157157
releasePendingProgressTargets(targets, false);
158158

159-
expect(getProgressComponent().hidden).toBe(false);
159+
expect(getProgressComponent().hidden).toBe(true);
160160
});
161161
});

‎chartlets.js/packages/lib/src/actions/helpers/pendingProgress.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
*/
66

77
import { store } from "@/store";
8-
import type { CallbackRequest, StateChangeRequest } from "@/types/model/callback";
8+
import type {
9+
CallbackRequest,
10+
StateChangeRequest,
11+
} from "@/types/model/callback";
912
import type { Output } from "@/types/model/channel";
1013
import type { ComponentState } from "@/types/state/component";
1114
import { applyStateChangeRequests } from "@/actions/helpers/applyStateChangeRequests";
@@ -57,7 +60,7 @@ export function getPendingProgressTargets(
5760

5861
export function showPendingProgressTargets(targets: PendingProgressTarget[]) {
5962
incrementPendingProgressCounts(targets);
60-
applyPendingProgressTargets(targets, true);
63+
applyPendingProgressTargets(targets, false);
6164
}
6265

6366
export function releasePendingProgressTargets(
@@ -68,13 +71,13 @@ export function releasePendingProgressTargets(
6871
const stillPendingTargets = targets.filter(
6972
(target) => pendingProgressCounts[getPendingProgressTargetKey(target)] > 0,
7073
);
71-
applyPendingProgressTargets(stillPendingTargets, true);
74+
applyPendingProgressTargets(stillPendingTargets, false);
7275

7376
if (!callbackSucceeded) {
7477
const completedTargets = targets.filter(
7578
(target) => !pendingProgressCounts[getPendingProgressTargetKey(target)],
7679
);
77-
applyPendingProgressTargets(completedTargets, false);
80+
applyPendingProgressTargets(completedTargets, true);
7881
}
7982
}
8083

@@ -135,4 +138,4 @@ function isProgressComponent(
135138
isProgressComponent(child, id),
136139
),
137140
);
138-
}
141+
}

‎chartlets.js/packages/lib/src/plugins/mui/CircularProgress.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ describe("CircularProgress", () => {
2323
expect(screen.getByRole("progressbar")).not.toBeUndefined();
2424
});
2525

26-
it("should not render when hidden is false", () => {
26+
it("should not render when hidden is true", () => {
2727
render(
2828
<CircularProgress
2929
type="CircularProgress"
3030
id="cp"
31-
hidden={false}
31+
hidden={true}
3232
onChange={() => {}}
3333
/>,
3434
);

‎chartlets.js/packages/lib/src/plugins/mui/CircularProgress.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ export const CircularProgress = ({
2222
size,
2323
value,
2424
variant,
25-
hidden = true,
25+
hidden = false,
2626
}: CircularProgressProps) => {
27-
if (!hidden) {
27+
if (hidden) {
2828
return null;
2929
}
3030

‎chartlets.js/packages/lib/src/plugins/mui/LinearProgress.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ describe("LinearProgress", () => {
2323
expect(screen.getByRole("progressbar")).not.toBeUndefined();
2424
});
2525

26-
it("should not render when hidden is false", () => {
26+
it("should not render when hidden is true", () => {
2727
render(
2828
<LinearProgress
2929
type="LinearProgress"
3030
id="cp"
31-
hidden={false}
31+
hidden={true}
3232
onChange={() => {}}
3333
/>,
3434
);

‎chartlets.js/packages/lib/src/plugins/mui/LinearProgress.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ export const LinearProgress = ({
2121
style,
2222
value,
2323
variant,
24-
hidden = true,
24+
hidden = false,
2525
}: LinearProgressProps) => {
26-
if (!hidden) {
26+
if (hidden) {
2727
return null;
2828
}
2929

‎chartlets.py/demo/my_extension/my_panel_10.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def render_panel(ctx: Context) -> Component:
3232
)
3333
progress = CircularProgress(
3434
id="loading_progress",
35-
hidden=False,
35+
hidden=True,
3636
size=32,
3737
style={"margin": "16px 0"},
3838
)
@@ -58,7 +58,7 @@ def render_panel(ctx: Context) -> Component:
5858
@panel.callback(
5959
Input("start_button", "clicked"),
6060
State("start_button", "text"),
61-
Output("loading_progress", "visible"),
61+
Output("loading_progress", "hidden"),
6262
Output("result_text", "text"),
6363
Output("start_button", "text"),
6464
Output("start_button", "color"),
@@ -67,7 +67,8 @@ def run_calculation(
6767
ctx: Context, clicked: bool, button_text: str
6868
) -> tuple[bool, str, str, str]:
6969
if button_text == "reset":
70-
return False, "", "wait for 3 seconds", "primary"
70+
return True, "", "wait for 3 seconds", "primary"
7171

7272
time.sleep(3)
73-
return False, "Finished waiting after 3 seconds.", "reset", "inherit"
73+
return True, "Finished waiting after 3 seconds.", "reset", "inherit"
74+

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL