Skip to content

Commit ec64b59

Browse files
robertbrignullrobertbrignull
committed
Pass className through DataGridCell
1 parent 54db867 commit ec64b59

3 files changed

Lines changed: 78 additions & 85 deletions

File tree

‎extensions/ql-vscode/src/view/common/DataGrid.tsx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,19 @@ const StyledDataGridCell = styled.div<{
6565
interface DataGridCellProps {
6666
gridRow: string | number;
6767
gridColumn: string | number;
68+
className?: string;
6869
children: React.ReactNode;
6970
}
7071

7172
export function DataGridCell(props: DataGridCellProps) {
72-
const { gridRow, gridColumn, children } = props;
73+
const { gridRow, gridColumn, className, children } = props;
7374

7475
return (
75-
<StyledDataGridCell $gridRow={gridRow} $gridColumn={gridColumn}>
76+
<StyledDataGridCell
77+
$gridRow={gridRow}
78+
$gridColumn={gridColumn}
79+
className={className}
80+
>
7681
{children}
7782
</StyledDataGridCell>
7883
);

‎extensions/ql-vscode/src/view/model-editor/HiddenMethodsRow.tsx‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { pluralize } from "../../common/word";
44
import { DataGridCell, DataGridRow } from "../common/DataGrid";
55
import { ModelEditorViewState } from "../../model-editor/shared/view-state";
66

7-
const HiddenMethodsText = styled.div`
7+
const HiddenMethodsText = styled(DataGridCell)`
88
text-align: center;
99
`;
1010

@@ -29,13 +29,11 @@ export function HiddenMethodsRow({
2929

3030
return (
3131
<DataGridRow>
32-
<DataGridCell gridRow={gridRow} gridColumn={gridColumn}>
33-
<HiddenMethodsText>
34-
{someMethodsAreVisible && "And "}
35-
{pluralize(numHiddenMethods, "method", "methods")} modeled in other
36-
CodeQL packs
37-
</HiddenMethodsText>
38-
</DataGridCell>
32+
<HiddenMethodsText gridRow={gridRow} gridColumn={gridColumn}>
33+
{someMethodsAreVisible && "And "}
34+
{pluralize(numHiddenMethods, "method", "methods")} modeled in other
35+
CodeQL packs
36+
</HiddenMethodsText>
3937
</DataGridRow>
4038
);
4139
}

‎extensions/ql-vscode/src/view/model-editor/MethodRow.tsx‎

Lines changed: 65 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { Codicon } from "../common";
2525
import { canAddNewModeledMethod } from "../../model-editor/shared/multiple-modeled-methods";
2626
import { DataGridCell, DataGridRow } from "../common/DataGrid";
2727

28-
const MultiModelColumn = styled.div`
28+
const MultiModelColumn = styled(DataGridCell)`
2929
display: flex;
3030
flex-direction: column;
3131
gap: 0.5em;
@@ -203,81 +203,71 @@ const ModelableMethodRow = forwardRef<HTMLElement | undefined, MethodRowProps>(
203203
)}
204204
{!props.modelingInProgress && (
205205
<>
206-
<DataGridCell gridRow={gridRow} gridColumn={2}>
207-
<MultiModelColumn>
208-
{modeledMethods.map((modeledMethod, index) => (
209-
<ModelTypeDropdown
210-
key={index}
211-
method={method}
212-
modeledMethod={modeledMethod}
213-
onChange={modeledMethodChangedHandlers[index]}
214-
/>
215-
))}
216-
</MultiModelColumn>
217-
</DataGridCell>
218-
<DataGridCell gridRow={gridRow} gridColumn={3}>
219-
<MultiModelColumn>
220-
{modeledMethods.map((modeledMethod, index) => (
221-
<ModelInputDropdown
222-
key={index}
223-
method={method}
224-
modeledMethod={modeledMethod}
225-
onChange={modeledMethodChangedHandlers[index]}
226-
/>
227-
))}
228-
</MultiModelColumn>
229-
</DataGridCell>
230-
<DataGridCell gridRow={gridRow} gridColumn={4}>
231-
<MultiModelColumn>
232-
{modeledMethods.map((modeledMethod, index) => (
233-
<ModelOutputDropdown
234-
key={index}
235-
method={method}
236-
modeledMethod={modeledMethod}
237-
onChange={modeledMethodChangedHandlers[index]}
238-
/>
239-
))}
240-
</MultiModelColumn>
241-
</DataGridCell>
242-
<DataGridCell gridRow={gridRow} gridColumn={5}>
243-
<MultiModelColumn>
244-
{modeledMethods.map((modeledMethod, index) => (
245-
<ModelKindDropdown
246-
key={index}
247-
method={method}
248-
modeledMethod={modeledMethod}
249-
onChange={modeledMethodChangedHandlers[index]}
250-
/>
251-
))}
252-
</MultiModelColumn>
253-
</DataGridCell>
206+
<MultiModelColumn gridRow={gridRow} gridColumn={2}>
207+
{modeledMethods.map((modeledMethod, index) => (
208+
<ModelTypeDropdown
209+
key={index}
210+
method={method}
211+
modeledMethod={modeledMethod}
212+
onChange={modeledMethodChangedHandlers[index]}
213+
/>
214+
))}
215+
</MultiModelColumn>
216+
<MultiModelColumn gridRow={gridRow} gridColumn={3}>
217+
{modeledMethods.map((modeledMethod, index) => (
218+
<ModelInputDropdown
219+
key={index}
220+
method={method}
221+
modeledMethod={modeledMethod}
222+
onChange={modeledMethodChangedHandlers[index]}
223+
/>
224+
))}
225+
</MultiModelColumn>
226+
<MultiModelColumn gridRow={gridRow} gridColumn={4}>
227+
{modeledMethods.map((modeledMethod, index) => (
228+
<ModelOutputDropdown
229+
key={index}
230+
method={method}
231+
modeledMethod={modeledMethod}
232+
onChange={modeledMethodChangedHandlers[index]}
233+
/>
234+
))}
235+
</MultiModelColumn>
236+
<MultiModelColumn gridRow={gridRow} gridColumn={5}>
237+
{modeledMethods.map((modeledMethod, index) => (
238+
<ModelKindDropdown
239+
key={index}
240+
method={method}
241+
modeledMethod={modeledMethod}
242+
onChange={modeledMethodChangedHandlers[index]}
243+
/>
244+
))}
245+
</MultiModelColumn>
254246
{viewState.showMultipleModels && (
255-
<DataGridCell gridRow={gridRow} gridColumn={6}>
256-
<MultiModelColumn>
257-
{modeledMethods.map((_, index) =>
258-
index === modeledMethods.length - 1 ? (
259-
<CodiconRow
260-
key={index}
261-
appearance="icon"
262-
aria-label="Add new model"
263-
onClick={handleAddModelClick}
264-
disabled={addModelButtonDisabled}
265-
>
266-
<Codicon name="add" />
267-
</CodiconRow>
268-
) : (
269-
<CodiconRow
270-
key={index}
271-
appearance="icon"
272-
aria-label="Remove model"
273-
onClick={removeModelClickedHandlers[index]}
274-
>
275-
<Codicon name="trash" />
276-
</CodiconRow>
277-
),
278-
)}
279-
</MultiModelColumn>
280-
</DataGridCell>
247+
<MultiModelColumn gridRow={gridRow} gridColumn={6}>
248+
{modeledMethods.map((_, index) =>
249+
index === modeledMethods.length - 1 ? (
250+
<CodiconRow
251+
key={index}
252+
appearance="icon"
253+
aria-label="Add new model"
254+
onClick={handleAddModelClick}
255+
disabled={addModelButtonDisabled}
256+
>
257+
<Codicon name="add" />
258+
</CodiconRow>
259+
) : (
260+
<CodiconRow
261+
key={index}
262+
appearance="icon"
263+
aria-label="Remove model"
264+
onClick={removeModelClickedHandlers[index]}
265+
>
266+
<Codicon name="trash" />
267+
</CodiconRow>
268+
),
269+
)}
270+
</MultiModelColumn>
281271
)}
282272
</>
283273
)}

0 commit comments

Comments
 (0)