File tree Expand file tree Collapse file tree 2 files changed +22
-13
lines changed Expand file tree Collapse file tree 2 files changed +22
-13
lines changed Original file line number Diff line number Diff line change @@ -163,13 +163,13 @@ export function Grid(props: GridProps) {
163
163
React . useEffect ( ( ) => {
164
164
if ( props . defaultSort )
165
165
handleSortChange ( props . defaultSort [ 0 ] , props . defaultSort [ 1 ] ) ;
166
- } , [ props . defaultSort ?. join ( ',' ) , props . data ] ) ;
166
+ } , [ props . defaultSort ?. join ( ',' ) ] ) ;
167
167
168
168
React . useEffect ( updateColumnNames , [ props . data , stickyColumnName ] ) ;
169
169
React . useEffect ( ( ) => {
170
170
if ( props . defaultStickyColumnName )
171
171
handleStickyColumnNameChange ( props . defaultStickyColumnName ) ;
172
- } , [ props . defaultStickyColumnName , props . data ] ) ;
172
+ } , [ props . defaultStickyColumnName ] ) ;
173
173
174
174
React . useEffect ( ( ) => {
175
175
handleIsEditableChange ( ! ! props . isEditable ) ;
Original file line number Diff line number Diff line change @@ -120,17 +120,26 @@ export const createGridStore = () =>
120
120
const columnNames = data . length
121
121
? Object . keys ( data [ 0 ] ) . filter ( ( d ) => ! utilKeys . includes ( d ) )
122
122
: [ ] ;
123
- draft . stickyColumnName = columnNames [ 0 ] ;
124
- draft . sort = columnNames [ 0 ]
125
- ? [
126
- columnNames [ 0 ] ,
127
- // @ts -ignore
128
- cellTypeMap [ draft . cellTypes [ columnNames [ 0 ] ] ] ?. sortValueType ===
129
- 'string'
130
- ? 'asc'
131
- : 'desc' ,
132
- ]
133
- : [ ] ;
123
+
124
+ if (
125
+ ! draft . stickyColumnName ||
126
+ ! columnNames . includes ( draft . stickyColumnName )
127
+ ) {
128
+ draft . stickyColumnName = columnNames [ 0 ] ;
129
+ }
130
+
131
+ if ( ! draft . sort . length ) {
132
+ draft . sort = draft . stickyColumnName
133
+ ? [
134
+ draft . stickyColumnName ,
135
+ // @ts -ignore
136
+ cellTypeMap [ draft . cellTypes [ draft . stickyColumnName ] ]
137
+ ?. sortValueType === 'string'
138
+ ? 'asc'
139
+ : 'desc' ,
140
+ ]
141
+ : [ ] ;
142
+ }
134
143
} ) ,
135
144
handleMetadataChange : ( metadata ) =>
136
145
set ( ( draft ) => {
You can’t perform that action at this time.
0 commit comments