Skip to content

Commit

Permalink
Merge pull request #299 from performant-software/feature/cdc271_impor…
Browse files Browse the repository at this point in the history
…t_modal_sort

CDC #271 - Import Modal Sort
  • Loading branch information
dleadbetter authored Sep 27, 2024
2 parents a1d8c0d + b890334 commit d0809b3
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 18 deletions.
6 changes: 3 additions & 3 deletions packages/controlled-vocabulary/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/controlled-vocabulary",
"version": "2.2.13",
"version": "2.2.14",
"description": "A package of components to allow user to configure dropdown elements. Use with the \"controlled_vocabulary\" gem.",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand All @@ -23,8 +23,8 @@
"underscore": "^1.13.2"
},
"peerDependencies": {
"@performant-software/semantic-components": "^2.2.13",
"@performant-software/shared-components": "^2.2.13",
"@performant-software/semantic-components": "^2.2.14",
"@performant-software/shared-components": "^2.2.14",
"react": ">= 16.13.1 < 19.0.0",
"react-dom": ">= 16.13.1 < 19.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/core-data/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/core-data",
"version": "2.2.13",
"version": "2.2.14",
"description": "A package of components used with the Core Data platform.",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand Down Expand Up @@ -40,8 +40,8 @@
"underscore": "^1.13.2"
},
"peerDependencies": {
"@performant-software/geospatial": "^2.2.13",
"@performant-software/shared-components": "^2.2.13",
"@performant-software/geospatial": "^2.2.14",
"@performant-software/shared-components": "^2.2.14",
"@peripleo/maplibre": "^0.5.2",
"@peripleo/peripleo": "^0.5.2",
"react": ">= 16.13.1 < 19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/geospatial/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/geospatial",
"version": "2.2.13",
"version": "2.2.14",
"description": "A package of components for all things map-related.",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/semantic-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/semantic-components",
"version": "2.2.13",
"version": "2.2.14",
"description": "A package of shared components based on the Semantic UI Framework.",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand Down Expand Up @@ -35,7 +35,7 @@
"zotero-translation-client": "^5.0.1"
},
"peerDependencies": {
"@performant-software/shared-components": "^2.2.13",
"@performant-software/shared-components": "^2.2.14",
"@samvera/clover-iiif": "^2.3.2",
"react": ">= 16.13.1 < 19.0.0",
"react-dnd": "^11.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/semantic-ui/src/components/DataTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ class DataTable extends Component<Props, State> {
color={action.color}
icon={action.icon}
key={`${action.name}-${index}`}
onClick={action.onClick && action.onClick.bind(this, item)}
onClick={action.onClick && action.onClick.bind(this, item, index)}
title={action.title}
/>
);
Expand Down
10 changes: 8 additions & 2 deletions packages/semantic-ui/src/components/EmbeddedList.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ type Props = DataTableProps & ColumnSelectorProps & {
/**
* Callback fired when a table row is dragged.
*/
onDrag?: (dragIndex: number, hoverIndex: number) => void
onDrag?: (dragIndex: number, hoverIndex: number) => void,

/**
* Props to apply to the underlying Table component.
*/
tableProps?: { [key: string]: any }
};

type State = {
Expand Down Expand Up @@ -178,7 +183,8 @@ class EmbeddedList extends Component<Props, State> {
sortDirection={this.state.sortDirection}
tableProps={{
celled: true,
sortable: !this.props.onDrag
sortable: !this.props.onDrag,
...(this.props.tableProps || {})
}}
selectable={this.props.selectable}
onRowSelect={this.props.onRowSelect}
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/shared-components",
"version": "2.2.13",
"version": "2.2.14",
"description": "A package of shared, framework agnostic, components.",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand Down
6 changes: 3 additions & 3 deletions packages/user-defined-fields/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/user-defined-fields",
"version": "2.2.13",
"version": "2.2.14",
"description": "A package of components used for allowing end users to define fields on models. Use with the \"user_defined_fields\" gem.",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand All @@ -23,8 +23,8 @@
"underscore": "^1.13.2"
},
"peerDependencies": {
"@performant-software/semantic-components": "^2.2.13",
"@performant-software/shared-components": "^2.2.13",
"@performant-software/semantic-components": "^2.2.14",
"@performant-software/shared-components": "^2.2.14",
"react": ">= 16.13.1 < 19.0.0",
"react-dom": ">= 16.13.1 < 19.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/visualize/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@performant-software/visualize",
"version": "2.2.13",
"version": "2.2.14",
"description": "A package of components used for data visualization",
"license": "MIT",
"main": "./dist/index.cjs.js",
Expand Down
2 changes: 1 addition & 1 deletion react-components.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"packages/user-defined-fields",
"packages/visualize"
],
"version": "2.2.13"
"version": "2.2.14"
}

0 comments on commit d0809b3

Please sign in to comment.