pixel-react 1.7.8 → 1.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/components/AllProjectsDropdown/types.d.ts +2 -0
- package/lib/components/Button/Button.d.ts +2 -2
- package/lib/components/Button/types.d.ts +17 -0
- package/lib/components/Charts/DashboardDonutChart/types.d.ts +2 -0
- package/lib/components/Charts/MultiRadialChart/types.d.ts +3 -0
- package/lib/components/ChooseFile/ChooseFile.d.ts +3 -0
- package/lib/components/ChooseFile/types.d.ts +68 -0
- package/lib/components/ConnectingBranch/ConnectingBranch.d.ts +2 -1
- package/lib/components/ConnectingBranch/data.d.ts +19 -33
- package/lib/components/ConnectingBranch/types.d.ts +10 -0
- package/lib/components/Excel/ExcelFile/ExcelFileComponents/actions.d.ts +7 -1
- package/lib/components/LabelEditTextField/types.d.ts +2 -0
- package/lib/components/MachineInputField/MachineInputField.d.ts +4 -1
- package/lib/components/Select/types.d.ts +1 -1
- package/lib/components/StatusCard/types.d.ts +2 -0
- package/lib/components/TableTree/Components/TableCell.d.ts +1 -1
- package/lib/components/TableTree/Components/TableRow.d.ts +1 -1
- package/lib/components/TableTree/data.d.ts +74 -0
- package/lib/components/TableTree/types.d.ts +4 -0
- package/lib/components/TextArea/Textarea.d.ts +1 -1
- package/lib/components/TextArea/Types.d.ts +1 -0
- package/lib/index.d.ts +176 -63
- package/lib/index.esm.js +458 -273
- package/lib/index.esm.js.map +1 -1
- package/lib/index.js +458 -272
- package/lib/index.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/utils/validateFile/validateFile.d.ts +2 -0
- package/package.json +2 -2
- package/src/assets/Themes/BaseTheme.scss +1 -0
- package/src/assets/Themes/BlueTheme.scss +44 -44
- package/src/assets/Themes/DarkTheme.scss +1 -0
- package/src/assets/icons/failed_status_icon.svg +1 -1
- package/src/assets/icons/flaky_status_icon.svg +1 -1
- package/src/assets/icons/settings.svg +3 -0
- package/src/assets/icons/skipped_status_icon.svg +1 -1
- package/src/assets/icons/warning_status_icon.svg +1 -1
- package/src/components/AllProjectsDropdown/types.ts +2 -0
- package/src/components/AppHeader/AppHeader.scss +6 -2
- package/src/components/Button/Button.scss +12 -0
- package/src/components/Button/Button.tsx +29 -11
- package/src/components/Button/types.ts +21 -0
- package/src/components/Charts/DashboardDonutChart/DashboardDonutChart.scss +83 -30
- package/src/components/Charts/DashboardDonutChart/DashboardDonutChart.stories.tsx +3 -0
- package/src/components/Charts/DashboardDonutChart/DashboardDonutChart.tsx +39 -16
- package/src/components/Charts/DashboardDonutChart/types.ts +2 -0
- package/src/components/Charts/MultiRadialChart/MultiRadialChart.scss +0 -1
- package/src/components/Charts/MultiRadialChart/MultiRadialChart.stories.tsx +2 -1
- package/src/components/Charts/MultiRadialChart/MultiRadialChart.tsx +18 -4
- package/src/components/Charts/MultiRadialChart/types.ts +4 -1
- package/src/components/ChooseFile/ChooseFile.stories.tsx +190 -0
- package/src/components/ChooseFile/ChooseFile.tsx +46 -0
- package/src/components/ChooseFile/types.ts +78 -0
- package/src/components/ConnectingBranch/BranchComponents/MachineInstances.tsx +94 -79
- package/src/components/ConnectingBranch/ConnectingBranch.scss +183 -195
- package/src/components/ConnectingBranch/ConnectingBranch.stories.tsx +33 -1
- package/src/components/ConnectingBranch/ConnectingBranch.tsx +121 -107
- package/src/components/ConnectingBranch/{data.ts → data.tsx} +106 -17
- package/src/components/ConnectingBranch/types.ts +21 -0
- package/src/components/Excel/ExcelFile/ExcelFile.tsx +1 -1
- package/src/components/Excel/ExcelFile/ExcelFileComponents/ActiveCell.tsx +13 -8
- package/src/components/Excel/ExcelFile/ExcelFileComponents/FloatingRect.tsx +6 -1
- package/src/components/Excel/ExcelFile/ExcelFileComponents/Spreadsheet.scss +30 -11
- package/src/components/Excel/ExcelFile/ExcelFileComponents/Spreadsheet.tsx +65 -19
- package/src/components/Excel/ExcelFile/ExcelFileComponents/actions.ts +14 -0
- package/src/components/Excel/ExcelFile/ExcelFileComponents/reducer.ts +16 -0
- package/src/components/Excel/ExcelToolBar/ExcelToolBar.tsx +6 -5
- package/src/components/Icon/iconList.ts +2 -0
- package/src/components/InputWithDropdown/InputWithDropdown.tsx +1 -1
- package/src/components/LabelEditTextField/LabelEditTextField.stories.tsx +8 -3
- package/src/components/LabelEditTextField/LabelEditTextField.tsx +28 -11
- package/src/components/LabelEditTextField/types.ts +2 -0
- package/src/components/MachineInputField/MachineInputField.tsx +67 -70
- package/src/components/NLPInput/components/NlpDropDown/NlpDropdown.scss +1 -1
- package/src/components/Select/Select.tsx +4 -4
- package/src/components/Select/types.ts +1 -1
- package/src/components/SequentialConnectingBranch/components/Branches/Branches.scss +1 -0
- package/src/components/SequentialConnectingBranch/components/Branches/Branches.tsx +2 -8
- package/src/components/StatusCard/StatusCard.scss +2 -1
- package/src/components/StatusCard/StatusCard.stories.tsx +59 -1
- package/src/components/StatusCard/StatusCard.tsx +10 -2
- package/src/components/StatusCard/types.ts +2 -0
- package/src/components/TableTree/Components/TableBody.tsx +19 -15
- package/src/components/TableTree/Components/TableCell.tsx +47 -31
- package/src/components/TableTree/Components/TableRow.tsx +4 -0
- package/src/components/TableTree/TableTree.scss +122 -109
- package/src/components/TableTree/data.ts +16 -1
- package/src/components/TableTree/types.ts +4 -0
- package/src/components/TextArea/Textarea.tsx +2 -0
- package/src/components/TextArea/Types.ts +3 -0
- package/src/index.ts +3 -0
- package/src/utils/validateFile/validateFile.stories.tsx +49 -0
- package/src/utils/validateFile/validateFile.ts +39 -0
- package/src/components/SequentialConnectingBranch/components/AddBrowserModal/AddBrowserModal.scss +0 -51
- package/src/components/SequentialConnectingBranch/components/AddBrowserModal/AddBrowserModal.tsx +0 -107
- package/src/components/SequentialConnectingBranch/components/AddBrowserModal/types.ts +0 -5
- package/src/components/SequentialConnectingBranch/components/DatasetListModal/DatasetListModal.scss +0 -31
- package/src/components/SequentialConnectingBranch/components/DatasetListModal/DatasetListModal.tsx +0 -85
- package/src/components/SequentialConnectingBranch/components/DatasetListModal/types.ts +0 -4
@@ -1,11 +1,22 @@
|
|
1
1
|
import React, { useEffect, useRef, useState } from 'react';
|
2
2
|
import './ConnectingBranch.scss';
|
3
|
-
import {
|
3
|
+
import {
|
4
|
+
ConnectBranchProps,
|
5
|
+
MachineData,
|
6
|
+
MachineInstance,
|
7
|
+
indexType,
|
8
|
+
} from './types';
|
4
9
|
import { ArcherContainer, ArcherElement } from 'react-archer';
|
5
10
|
import MachineInstances from './BranchComponents/MachineInstances';
|
6
11
|
import Typography from '../Typography';
|
7
12
|
|
8
|
-
const ConnectingBranch: React.FC = ({
|
13
|
+
const ConnectingBranch: React.FC<ConnectBranchProps> = ({
|
14
|
+
data: machineData,
|
15
|
+
getChildNodeComponent,
|
16
|
+
getParentNodeComponent,
|
17
|
+
getParentNodeComponentActionItems,
|
18
|
+
childNodeCurveHeight = 1.28,
|
19
|
+
}) => {
|
9
20
|
const datasetRef = useRef<HTMLDivElement | null>(null);
|
10
21
|
const [datasetHeight, setDatasetHeight] = useState<number>(0);
|
11
22
|
const [curveHeights, setCurveHeights] = useState<number[]>([]);
|
@@ -31,7 +42,7 @@ const ConnectingBranch: React.FC = ({ machineData }: MachineData) => {
|
|
31
42
|
const calculateCurveHeight = () => {
|
32
43
|
const heights = itemRefs.current.map((_, index) => {
|
33
44
|
if (index === 0) return 0;
|
34
|
-
return datasetHeight *
|
45
|
+
return datasetHeight * childNodeCurveHeight;
|
35
46
|
});
|
36
47
|
setCurveHeights(heights);
|
37
48
|
};
|
@@ -65,117 +76,120 @@ const ConnectingBranch: React.FC = ({ machineData }: MachineData) => {
|
|
65
76
|
machineData.executionSettings.machines.selectedMachines.length / 2
|
66
77
|
);
|
67
78
|
return (
|
68
|
-
<
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
(
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
79
|
+
<div className="connecting-branch-container">
|
80
|
+
<ArcherContainer
|
81
|
+
strokeColor="var(--brand-color)"
|
82
|
+
strokeWidth={1}
|
83
|
+
startMarker={true}
|
84
|
+
endMarker={false}
|
85
|
+
noCurves
|
86
|
+
>
|
87
|
+
<div className="ff-connecting-branch-grid-container">
|
88
|
+
{machineData?.executionSettings?.machines?.selectedMachines.map(
|
89
|
+
(machine: MachineData, index: indexType) => {
|
90
|
+
const rowStart = currentRow;
|
91
|
+
const rowSpan = calculateRowSpan(machine);
|
92
|
+
currentRow += rowSpan;
|
93
|
+
const gap = 16;
|
94
|
+
const verticalLineHeight = calculateVerticalLineHeight(
|
95
|
+
machine?.machineInstances,
|
96
|
+
datasetHeight,
|
97
|
+
gap
|
98
|
+
);
|
99
|
+
return (
|
100
|
+
<React.Fragment key={index}>
|
101
|
+
{/* Show ff-script-count-box only for the middle index */}
|
102
|
+
{((!isOddMachineCount && index === middleIndex) ||
|
103
|
+
(isOddMachineCount && index === 0)) && (
|
104
|
+
<ArcherElement id="rootNode">
|
105
|
+
<div
|
106
|
+
className="ff-grid-item ff-dynamic-item"
|
107
|
+
style={{
|
108
|
+
gridRow: `${
|
109
|
+
!isOddMachineCount ? rowStart : oddCountRow
|
110
|
+
}`,
|
111
|
+
}}
|
112
|
+
>
|
113
|
+
<div className="ff-script-count-container">
|
114
|
+
<div className="ff-script-count-box">
|
115
|
+
<Typography fontSize={12} fontWeight="regular">
|
116
|
+
{
|
117
|
+
machineData?.executionSettings?.machines
|
118
|
+
?.totalNoScript
|
119
|
+
}
|
120
|
+
</Typography>
|
121
|
+
<Typography fontSize={12} fontWeight="regular">
|
122
|
+
Scripts
|
123
|
+
</Typography>
|
124
|
+
</div>
|
113
125
|
</div>
|
114
126
|
</div>
|
115
|
-
</
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
<div className="ff-selectedMachines-input">
|
126
|
-
<ArcherElement
|
127
|
-
id={`machine${index}`}
|
128
|
-
key={index}
|
129
|
-
relations={[
|
130
|
-
{
|
131
|
-
targetId: 'rootMachine',
|
132
|
-
targetAnchor: 'left',
|
133
|
-
sourceAnchor: 'left',
|
134
|
-
},
|
135
|
-
]}
|
136
|
-
>
|
127
|
+
</ArcherElement>
|
128
|
+
)}
|
129
|
+
{/* Selected Machine */}
|
130
|
+
<div
|
131
|
+
className="ff-selectedMachines"
|
132
|
+
style={{
|
133
|
+
gridRow: `${rowStart} / span ${rowSpan}`,
|
134
|
+
}}
|
135
|
+
>
|
136
|
+
<div className="ff-selectedMachines-input">
|
137
137
|
<div className="ff-input-box-container">
|
138
|
-
|
138
|
+
<ArcherElement
|
139
|
+
id={`parentnode${index}`}
|
140
|
+
key={machine?.clientId}
|
141
|
+
relations={[
|
142
|
+
{
|
143
|
+
targetId: 'rootNode',
|
144
|
+
targetAnchor: 'left',
|
145
|
+
sourceAnchor: 'left',
|
146
|
+
},
|
147
|
+
]}
|
148
|
+
>
|
149
|
+
{/* Todo: here we will add select dropdown */}
|
150
|
+
{getParentNodeComponent(false, machine, index)}
|
151
|
+
</ArcherElement>
|
152
|
+
{getParentNodeComponentActionItems(machine, index)}
|
139
153
|
</div>
|
140
|
-
</
|
154
|
+
</div>
|
155
|
+
<MachineInstances
|
156
|
+
parentNode={index}
|
157
|
+
data={machine}
|
158
|
+
verticalLineHeight={verticalLineHeight}
|
159
|
+
datasetHeight={datasetHeight}
|
160
|
+
curveHeights={curveHeights}
|
161
|
+
itemRefs={itemRefs}
|
162
|
+
datasetRef={datasetRef}
|
163
|
+
getChildNodeComponent={getChildNodeComponent}
|
164
|
+
/>
|
141
165
|
</div>
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
);
|
153
|
-
}
|
154
|
-
)}
|
155
|
-
{/* Select Machine Input */}
|
156
|
-
<div
|
157
|
-
className="ff-select-machine-input"
|
158
|
-
style={{
|
159
|
-
gridRow: `${currentRow}`,
|
160
|
-
}}
|
161
|
-
>
|
162
|
-
<ArcherElement
|
163
|
-
id="footerInput"
|
164
|
-
relations={[
|
165
|
-
{
|
166
|
-
targetId: 'rootMachine',
|
167
|
-
targetAnchor: 'left',
|
168
|
-
sourceAnchor: 'left',
|
169
|
-
},
|
170
|
-
]}
|
166
|
+
</React.Fragment>
|
167
|
+
);
|
168
|
+
}
|
169
|
+
)}
|
170
|
+
{/* Select Machine Input */}
|
171
|
+
<div
|
172
|
+
className="ff-select-machine-input"
|
173
|
+
style={{
|
174
|
+
gridRow: `${currentRow}`,
|
175
|
+
}}
|
171
176
|
>
|
172
|
-
<
|
173
|
-
|
174
|
-
|
175
|
-
|
177
|
+
<ArcherElement
|
178
|
+
id="lastNode"
|
179
|
+
relations={[
|
180
|
+
{
|
181
|
+
targetId: 'rootNode',
|
182
|
+
targetAnchor: 'left',
|
183
|
+
sourceAnchor: 'left',
|
184
|
+
},
|
185
|
+
]}
|
186
|
+
>
|
187
|
+
<div>{getParentNodeComponent(true)}</div>
|
188
|
+
</ArcherElement>
|
189
|
+
</div>
|
176
190
|
</div>
|
177
|
-
</
|
178
|
-
</
|
191
|
+
</ArcherContainer>
|
192
|
+
</div>
|
179
193
|
);
|
180
194
|
};
|
181
195
|
|
@@ -11,7 +11,15 @@ const machineData = {
|
|
11
11
|
globalVariableSetId: 'UUID',
|
12
12
|
testDataSetId: 'UUID',
|
13
13
|
},
|
14
|
-
|
14
|
+
machineInstances: [],
|
15
|
+
},
|
16
|
+
{
|
17
|
+
clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
|
18
|
+
executionDataSet: {
|
19
|
+
peVariableSetId: 'UUID',
|
20
|
+
globalVariableSetId: 'UUID',
|
21
|
+
testDataSetId: 'UUID',
|
22
|
+
},
|
15
23
|
machineInstances: [
|
16
24
|
{
|
17
25
|
clientId:
|
@@ -26,7 +34,22 @@ const machineData = {
|
|
26
34
|
osVersion: '10.0.22000',
|
27
35
|
hostName: 'LAPTOP-T793RVQN',
|
28
36
|
},
|
29
|
-
deviceInfo: [
|
37
|
+
deviceInfo: [
|
38
|
+
{
|
39
|
+
version: '10.0',
|
40
|
+
name: 'Samsung Galaxy Note 20 Ultra',
|
41
|
+
type: 'local',
|
42
|
+
subType: 'device',
|
43
|
+
platform: 'android',
|
44
|
+
},
|
45
|
+
{
|
46
|
+
version: '18',
|
47
|
+
name: 'iPhone 14',
|
48
|
+
type: 'local',
|
49
|
+
subType: 'device',
|
50
|
+
platform: 'ios',
|
51
|
+
},
|
52
|
+
],
|
30
53
|
headless: false,
|
31
54
|
runLevelExecutionDataSets: [
|
32
55
|
{
|
@@ -34,18 +57,57 @@ const machineData = {
|
|
34
57
|
globalVariableSetId: 'UUID',
|
35
58
|
testDataSetId: 'UUID',
|
36
59
|
runScriptCount: 12,
|
60
|
+
browserRenderer: `<div>browser</div>`,
|
61
|
+
},
|
62
|
+
],
|
63
|
+
},
|
64
|
+
],
|
65
|
+
},
|
66
|
+
{
|
67
|
+
clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
|
68
|
+
executionDataSet: {
|
69
|
+
peVariableSetId: 'UUID',
|
70
|
+
globalVariableSetId: 'UUID',
|
71
|
+
testDataSetId: 'UUID',
|
72
|
+
},
|
73
|
+
machineInstances: [
|
74
|
+
{
|
75
|
+
clientId:
|
76
|
+
'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
|
77
|
+
numberOfRuns: '3',
|
78
|
+
executionEnv: 'Local',
|
79
|
+
browserName: 'Google Chrome',
|
80
|
+
browserVersion: '107.0.5304.88',
|
81
|
+
systemUrl: '',
|
82
|
+
machineInfo: {
|
83
|
+
osName: 'Windows 11 Home Single Language',
|
84
|
+
osVersion: '10.0.22000',
|
85
|
+
hostName: 'LAPTOP-T793RVQN',
|
86
|
+
},
|
87
|
+
deviceInfo: [
|
88
|
+
{
|
89
|
+
version: '10.0',
|
90
|
+
name: 'Samsung Galaxy Note 20 Ultra',
|
91
|
+
type: 'local',
|
92
|
+
subType: 'device',
|
93
|
+
platform: 'android',
|
37
94
|
},
|
38
95
|
{
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
96
|
+
version: '18',
|
97
|
+
name: 'iPhone 14',
|
98
|
+
type: 'local',
|
99
|
+
subType: 'device',
|
100
|
+
platform: 'ios',
|
43
101
|
},
|
102
|
+
],
|
103
|
+
headless: false,
|
104
|
+
runLevelExecutionDataSets: [
|
44
105
|
{
|
45
106
|
peVariableSetId: 'UUID_1',
|
46
107
|
globalVariableSetId: 'UUID',
|
47
108
|
testDataSetId: 'UUID',
|
48
109
|
runScriptCount: 12,
|
110
|
+
browserRenderer: `<div>browser</div>`,
|
49
111
|
},
|
50
112
|
],
|
51
113
|
},
|
@@ -62,13 +124,30 @@ const machineData = {
|
|
62
124
|
osVersion: '10.0.22000',
|
63
125
|
hostName: 'LAPTOP-T793RVQN',
|
64
126
|
},
|
65
|
-
deviceInfo: [
|
127
|
+
deviceInfo: [
|
128
|
+
{
|
129
|
+
version: '10.0',
|
130
|
+
name: 'Samsung Galaxy Note 20 Ultra',
|
131
|
+
type: 'local',
|
132
|
+
subType: 'device',
|
133
|
+
platform: 'android',
|
134
|
+
},
|
135
|
+
{
|
136
|
+
version: '18',
|
137
|
+
name: 'iPhone 14',
|
138
|
+
type: 'local',
|
139
|
+
subType: 'device',
|
140
|
+
platform: 'ios',
|
141
|
+
},
|
142
|
+
],
|
66
143
|
headless: false,
|
67
144
|
runLevelExecutionDataSets: [
|
68
145
|
{
|
69
146
|
peVariableSetId: 'UUID_1',
|
70
147
|
globalVariableSetId: 'UUID',
|
71
148
|
testDataSetId: 'UUID',
|
149
|
+
runScriptCount: 12,
|
150
|
+
executionDataSetId: 'uuid',
|
72
151
|
},
|
73
152
|
],
|
74
153
|
},
|
@@ -81,7 +160,6 @@ const machineData = {
|
|
81
160
|
globalVariableSetId: 'UUID',
|
82
161
|
testDataSetId: 'UUID',
|
83
162
|
},
|
84
|
-
totalScript: 250,
|
85
163
|
machineInstances: [
|
86
164
|
{
|
87
165
|
clientId:
|
@@ -96,33 +174,44 @@ const machineData = {
|
|
96
174
|
osVersion: '10.0.22000',
|
97
175
|
hostName: 'LAPTOP-T793RVQN',
|
98
176
|
},
|
99
|
-
deviceInfo: [
|
100
|
-
headless: false,
|
101
|
-
runLevelExecutionDataSets: [
|
177
|
+
deviceInfo: [
|
102
178
|
{
|
103
|
-
|
104
|
-
|
105
|
-
|
179
|
+
version: '10.0',
|
180
|
+
name: 'Samsung Galaxy Note 20 Ultra',
|
181
|
+
type: 'local',
|
182
|
+
subType: 'device',
|
183
|
+
platform: 'android',
|
106
184
|
},
|
107
185
|
{
|
108
|
-
|
109
|
-
|
110
|
-
|
186
|
+
version: '18',
|
187
|
+
name: 'iPhone 14',
|
188
|
+
type: 'local',
|
189
|
+
subType: 'device',
|
190
|
+
platform: 'ios',
|
111
191
|
},
|
192
|
+
],
|
193
|
+
headless: false,
|
194
|
+
runLevelExecutionDataSets: [
|
112
195
|
{
|
113
196
|
peVariableSetId: 'UUID_1',
|
114
197
|
globalVariableSetId: 'UUID',
|
115
198
|
testDataSetId: 'UUID',
|
199
|
+
runScriptCount: 12,
|
200
|
+
browserRenderer: `<div>browser</div>`,
|
116
201
|
},
|
117
202
|
{
|
118
203
|
peVariableSetId: 'UUID_1',
|
119
204
|
globalVariableSetId: 'UUID',
|
120
205
|
testDataSetId: 'UUID',
|
206
|
+
runScriptCount: 12,
|
207
|
+
browserRenderer: `<div>browser</div>`,
|
121
208
|
},
|
122
209
|
{
|
123
210
|
peVariableSetId: 'UUID_1',
|
124
211
|
globalVariableSetId: 'UUID',
|
125
212
|
testDataSetId: 'UUID',
|
213
|
+
runScriptCount: 12,
|
214
|
+
browserRenderer: `<div>browser</div>`,
|
126
215
|
},
|
127
216
|
],
|
128
217
|
},
|
@@ -1,3 +1,5 @@
|
|
1
|
+
import { ReactElement } from 'react';
|
2
|
+
|
1
3
|
type MachineInstanceData = any;
|
2
4
|
export interface MachineInstance {
|
3
5
|
[key: string]: MachineInstanceData;
|
@@ -9,13 +11,32 @@ export interface MachineData {
|
|
9
11
|
[key: string]: machineDataObj;
|
10
12
|
}
|
11
13
|
export interface MachineInstancesProps {
|
14
|
+
parentNode: number;
|
12
15
|
data: MachineData;
|
13
16
|
verticalLineHeight: number;
|
14
17
|
datasetHeight: number;
|
15
18
|
curveHeights: number[];
|
16
19
|
itemRefs: React.MutableRefObject<(HTMLDivElement | null)[]>;
|
17
20
|
datasetRef: React.RefObject<HTMLDivElement>;
|
21
|
+
getChildNodeComponent: (
|
22
|
+
isButton: boolean,
|
23
|
+
...args: any[]
|
24
|
+
) => ReactElement<any, any>;
|
18
25
|
}
|
19
26
|
|
20
27
|
export type indexType = number;
|
21
28
|
export type rowType = number;
|
29
|
+
|
30
|
+
export interface ConnectBranchProps {
|
31
|
+
data: MachineData;
|
32
|
+
childNodeCurveHeight?: number;
|
33
|
+
getParentNodeComponent: (
|
34
|
+
isMultiSelect: boolean,
|
35
|
+
...args: any[]
|
36
|
+
) => ReactElement<any, any>;
|
37
|
+
getParentNodeComponentActionItems: (...args: any[]) => ReactElement<any, any>;
|
38
|
+
getChildNodeComponent: (
|
39
|
+
isButton: boolean,
|
40
|
+
...args: any[]
|
41
|
+
) => ReactElement<any, any>;
|
42
|
+
}
|
@@ -38,11 +38,19 @@ const ActiveCell: React.FC<Props> = (props) => {
|
|
38
38
|
const cell = useSelector((state) =>
|
39
39
|
state.active ? Matrix.get(state.active, state.model.data) : undefined
|
40
40
|
);
|
41
|
-
const dimensions = useSelector((state) =>
|
42
|
-
active
|
41
|
+
const dimensions = useSelector((state) => {
|
42
|
+
let dimensionValue = active
|
43
43
|
? getCellDimensions(active, state.rowDimensions, state.columnDimensions)
|
44
|
-
: undefined
|
45
|
-
|
44
|
+
: undefined;
|
45
|
+
dimensionValue = {
|
46
|
+
top: dimensionValue?.top ?? 0,
|
47
|
+
height: (dimensionValue?.height ?? 0) + 1,
|
48
|
+
left: dimensionValue?.left ?? 0,
|
49
|
+
width: (dimensionValue?.width ?? 0) + 1,
|
50
|
+
};
|
51
|
+
return dimensionValue;
|
52
|
+
});
|
53
|
+
|
46
54
|
const hidden = React.useMemo(
|
47
55
|
() => !active || !dimensions,
|
48
56
|
[active, dimensions]
|
@@ -132,10 +140,7 @@ const ActiveCell: React.FC<Props> = (props) => {
|
|
132
140
|
exitEditMode={view}
|
133
141
|
/>
|
134
142
|
)}
|
135
|
-
<div
|
136
|
-
onMouseDown={handleMouseDown}
|
137
|
-
className="select_dot"
|
138
|
-
></div>
|
143
|
+
<div onMouseDown={handleMouseDown} className="select_dot"></div>
|
139
144
|
</div>
|
140
145
|
);
|
141
146
|
};
|
@@ -48,7 +48,12 @@ const FloatingRect: React.FC<Props> = ({
|
|
48
48
|
'ff-spreadsheet-floating-rect--dragging': dragging,
|
49
49
|
'ff-spreadsheet-floating-rect--hidden': hidden,
|
50
50
|
})}
|
51
|
-
style={{
|
51
|
+
style={{
|
52
|
+
width: (adjustedWidth ?? 0) + 1,
|
53
|
+
height: (adjustedHeight ?? 0) + 1,
|
54
|
+
top,
|
55
|
+
left,
|
56
|
+
}}
|
52
57
|
/>
|
53
58
|
);
|
54
59
|
};
|
@@ -3,6 +3,7 @@
|
|
3
3
|
.ff-excel {
|
4
4
|
display: flex;
|
5
5
|
flex-direction: column;
|
6
|
+
height: 100%;
|
6
7
|
|
7
8
|
.ff-excel-toolbar-container {
|
8
9
|
position: relative;
|
@@ -12,7 +13,7 @@
|
|
12
13
|
margin-bottom: 20px;
|
13
14
|
}
|
14
15
|
|
15
|
-
.ff-spreadsheet {
|
16
|
+
.ff-excel-spreadsheet {
|
16
17
|
--background-color: var(--drawer-footer-bg);
|
17
18
|
--text-color: var(--text-color);
|
18
19
|
--readonly-text-color: var(--toggle-strip-active);
|
@@ -30,10 +31,29 @@
|
|
30
31
|
display: inline-block;
|
31
32
|
}
|
32
33
|
|
34
|
+
.ff-excel-header-hider {
|
35
|
+
position: absolute;
|
36
|
+
background-color: var(--excel-header-border);
|
37
|
+
z-index: 500;
|
38
|
+
left: -1px;
|
39
|
+
top: 59px;
|
40
|
+
}
|
41
|
+
|
42
|
+
.ff-excel-header-column-hider {
|
43
|
+
height: 34px;
|
44
|
+
width: 100%;
|
45
|
+
}
|
46
|
+
|
47
|
+
.ff-excel-header-row-hider {
|
48
|
+
bottom: 0px;
|
49
|
+
width: 60px;
|
50
|
+
}
|
51
|
+
|
33
52
|
.ff-spreadsheet-active-cell {
|
34
53
|
position: absolute;
|
35
|
-
border:
|
54
|
+
border: 1px solid var(--outline-color);
|
36
55
|
box-sizing: border-box;
|
56
|
+
z-index: 100;
|
37
57
|
}
|
38
58
|
|
39
59
|
.ff-spreadsheet-active-cell--edit {
|
@@ -87,7 +107,6 @@
|
|
87
107
|
}
|
88
108
|
|
89
109
|
.ff-spreadsheet-header {
|
90
|
-
border: 0.1px solid var(--border-color);
|
91
110
|
background-color: var(--header-background-color);
|
92
111
|
color: var(--readonly-text-color);
|
93
112
|
text-align: center;
|
@@ -99,7 +118,8 @@
|
|
99
118
|
|
100
119
|
.ff-spreadsheet-corner-header {
|
101
120
|
position: fixed;
|
102
|
-
z-index:
|
121
|
+
z-index: 2000;
|
122
|
+
border: 2px solid var(--border-color);
|
103
123
|
}
|
104
124
|
|
105
125
|
.ff-spreadsheet-row-header {
|
@@ -107,16 +127,15 @@
|
|
107
127
|
}
|
108
128
|
|
109
129
|
.corner-header {
|
110
|
-
border: 1px solid var(--border-color);
|
111
130
|
background-color: var(--header-background-color);
|
112
131
|
position: absolute;
|
113
132
|
display: flex;
|
114
133
|
align-items: center;
|
115
134
|
justify-content: center;
|
116
|
-
z-index:
|
117
|
-
top: -
|
118
|
-
width:
|
119
|
-
height:
|
135
|
+
z-index: 1500;
|
136
|
+
top: -2px;
|
137
|
+
width: 58px;
|
138
|
+
height: 32px;
|
120
139
|
left: -1px;
|
121
140
|
}
|
122
141
|
|
@@ -169,7 +188,7 @@
|
|
169
188
|
|
170
189
|
.ff-spreadsheet-floating-rect--selected {
|
171
190
|
background: var(--outline-background-color);
|
172
|
-
border:
|
191
|
+
border: 1px var(--outline-color) solid;
|
173
192
|
}
|
174
193
|
|
175
194
|
.ff-spreadsheet-floating-rect--dragging {
|
@@ -177,6 +196,6 @@
|
|
177
196
|
}
|
178
197
|
|
179
198
|
.ff-spreadsheet-floating-rect--copied {
|
180
|
-
border:
|
199
|
+
border: 1px var(--outline-color) dashed;
|
181
200
|
}
|
182
201
|
}
|