Skip to content

Commit d0809b3

Browse files
authored
Merge pull request #299 from performant-software/feature/cdc271_import_modal_sort
CDC #271 - Import Modal Sort
2 parents a1d8c0d + b890334 commit d0809b3

File tree

10 files changed

+24
-18
lines changed

10 files changed

+24
-18
lines changed

packages/controlled-vocabulary/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@performant-software/controlled-vocabulary",
3-
"version": "2.2.13",
3+
"version": "2.2.14",
44
"description": "A package of components to allow user to configure dropdown elements. Use with the \"controlled_vocabulary\" gem.",
55
"license": "MIT",
66
"main": "./dist/index.cjs.js",
@@ -23,8 +23,8 @@
2323
"underscore": "^1.13.2"
2424
},
2525
"peerDependencies": {
26-
"@performant-software/semantic-components": "^2.2.13",
27-
"@performant-software/shared-components": "^2.2.13",
26+
"@performant-software/semantic-components": "^2.2.14",
27+
"@performant-software/shared-components": "^2.2.14",
2828
"react": ">= 16.13.1 < 19.0.0",
2929
"react-dom": ">= 16.13.1 < 19.0.0"
3030
},

packages/core-data/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@performant-software/core-data",
3-
"version": "2.2.13",
3+
"version": "2.2.14",
44
"description": "A package of components used with the Core Data platform.",
55
"license": "MIT",
66
"main": "./dist/index.cjs.js",
@@ -40,8 +40,8 @@
4040
"underscore": "^1.13.2"
4141
},
4242
"peerDependencies": {
43-
"@performant-software/geospatial": "^2.2.13",
44-
"@performant-software/shared-components": "^2.2.13",
43+
"@performant-software/geospatial": "^2.2.14",
44+
"@performant-software/shared-components": "^2.2.14",
4545
"@peripleo/maplibre": "^0.5.2",
4646
"@peripleo/peripleo": "^0.5.2",
4747
"react": ">= 16.13.1 < 19.0.0",

packages/geospatial/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@performant-software/geospatial",
3-
"version": "2.2.13",
3+
"version": "2.2.14",
44
"description": "A package of components for all things map-related.",
55
"license": "MIT",
66
"main": "./dist/index.cjs.js",

packages/semantic-ui/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@performant-software/semantic-components",
3-
"version": "2.2.13",
3+
"version": "2.2.14",
44
"description": "A package of shared components based on the Semantic UI Framework.",
55
"license": "MIT",
66
"main": "./dist/index.cjs.js",
@@ -35,7 +35,7 @@
3535
"zotero-translation-client": "^5.0.1"
3636
},
3737
"peerDependencies": {
38-
"@performant-software/shared-components": "^2.2.13",
38+
"@performant-software/shared-components": "^2.2.14",
3939
"@samvera/clover-iiif": "^2.3.2",
4040
"react": ">= 16.13.1 < 19.0.0",
4141
"react-dnd": "^11.1.3",

packages/semantic-ui/src/components/DataTable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ class DataTable extends Component<Props, State> {
312312
color={action.color}
313313
icon={action.icon}
314314
key={`${action.name}-${index}`}
315-
onClick={action.onClick && action.onClick.bind(this, item)}
315+
onClick={action.onClick && action.onClick.bind(this, item, index)}
316316
title={action.title}
317317
/>
318318
);

packages/semantic-ui/src/components/EmbeddedList.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@ type Props = DataTableProps & ColumnSelectorProps & {
2424
/**
2525
* Callback fired when a table row is dragged.
2626
*/
27-
onDrag?: (dragIndex: number, hoverIndex: number) => void
27+
onDrag?: (dragIndex: number, hoverIndex: number) => void,
28+
29+
/**
30+
* Props to apply to the underlying Table component.
31+
*/
32+
tableProps?: { [key: string]: any }
2833
};
2934

3035
type State = {
@@ -178,7 +183,8 @@ class EmbeddedList extends Component<Props, State> {
178183
sortDirection={this.state.sortDirection}
179184
tableProps={{
180185
celled: true,
181-
sortable: !this.props.onDrag
186+
sortable: !this.props.onDrag,
187+
...(this.props.tableProps || {})
182188
}}
183189
selectable={this.props.selectable}
184190
onRowSelect={this.props.onRowSelect}

packages/shared/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@performant-software/shared-components",
3-
"version": "2.2.13",
3+
"version": "2.2.14",
44
"description": "A package of shared, framework agnostic, components.",
55
"license": "MIT",
66
"main": "./dist/index.cjs.js",

packages/user-defined-fields/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@performant-software/user-defined-fields",
3-
"version": "2.2.13",
3+
"version": "2.2.14",
44
"description": "A package of components used for allowing end users to define fields on models. Use with the \"user_defined_fields\" gem.",
55
"license": "MIT",
66
"main": "./dist/index.cjs.js",
@@ -23,8 +23,8 @@
2323
"underscore": "^1.13.2"
2424
},
2525
"peerDependencies": {
26-
"@performant-software/semantic-components": "^2.2.13",
27-
"@performant-software/shared-components": "^2.2.13",
26+
"@performant-software/semantic-components": "^2.2.14",
27+
"@performant-software/shared-components": "^2.2.14",
2828
"react": ">= 16.13.1 < 19.0.0",
2929
"react-dom": ">= 16.13.1 < 19.0.0"
3030
},

packages/visualize/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@performant-software/visualize",
3-
"version": "2.2.13",
3+
"version": "2.2.14",
44
"description": "A package of components used for data visualization",
55
"license": "MIT",
66
"main": "./dist/index.cjs.js",

react-components.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"packages/user-defined-fields",
99
"packages/visualize"
1010
],
11-
"version": "2.2.13"
11+
"version": "2.2.14"
1212
}

0 commit comments

Comments
 (0)