@journeyapps-labs/reactor-mod-data-browser 3.1.3 → 3.2.1

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/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @journeyapps-labs/reactor-mod-data-browser
2
2
 
3
+ ## 3.2.1
4
+
5
+ ### Patch Changes
6
+
7
+ - 5b59443: Update labs/reactor packages
8
+
9
+ ## 3.2.0
10
+
11
+ ### Minor Changes
12
+
13
+ - 35229c1: Improve query panel state behavior for data browser queries.
14
+ - Default new simple queries to sort by `updated_at` descending.
15
+ - Keep in-memory query page and table scroll offsets when switching tabs.
16
+ - Fix browser-reload query panels getting stuck by reactively triggering initial query load after hydration.
17
+
3
18
  ## 3.1.3
4
19
 
5
20
  ### Patch Changes
@@ -4,5 +4,11 @@ import { AbstractQuery } from '../../core/query/AbstractQuery';
4
4
  export interface PageResultsWidgetProps {
5
5
  page: Page;
6
6
  query: AbstractQuery;
7
+ scrollTop: number;
8
+ scrollLeft: number;
9
+ onScroll: (offsets: {
10
+ top: number;
11
+ left: number;
12
+ }) => void;
7
13
  }
8
14
  export declare const PageResultsWidget: React.FC<PageResultsWidgetProps>;
@@ -5,10 +5,14 @@ import { ConnectionStore } from '../../stores/ConnectionStore';
5
5
  import { WorkspaceModelFactoryEvent } from '@projectstorm/react-workspaces-core';
6
6
  import { AbstractConnection } from '../../core/AbstractConnection';
7
7
  import { SharedConnectionPanelFactory } from '../_shared/SharedConnectionPanelFactory';
8
+ import { Page } from '../../core/query/Page';
8
9
  export declare class QueryPanelModel extends ReactorPanelModel {
9
10
  accessor connStore: ConnectionStore;
10
11
  accessor query: AbstractQuery;
11
12
  accessor current_page: number;
13
+ accessor current_page_data: Page | null;
14
+ accessor table_scroll_top: number;
15
+ accessor table_scroll_left: number;
12
16
  constructor(query: AbstractQuery);
13
17
  isSerializable(): boolean;
14
18
  toArray(): {
@@ -10,6 +10,7 @@ import { applyFiltersAndSorts } from './SimpleQueryPlanner';
10
10
  import { buildSimpleQueryColumns } from './SimpleQueryColumns';
11
11
  import { SimpleQuerySortState } from './SimpleQuerySortState';
12
12
  import { SimpleQueryFilterState } from './SimpleQueryFilterState';
13
+ import { StandardModelFields } from '../StandardModelFields';
13
14
  import * as _ from 'lodash';
14
15
  export { SortDirection, SimpleQuerySort };
15
16
  let SimpleQuery = (() => {
@@ -71,6 +72,11 @@ let SimpleQuery = (() => {
71
72
  onStateChange();
72
73
  }
73
74
  });
75
+ // Some code paths construct a shell query (no definition) before deserialize/hydration.
76
+ // Only seed the default sort once a definition exists to avoid premature load() calls.
77
+ if (options.definition && this.sortState.sorts.length === 0) {
78
+ this.sortState.addSort(SimpleQuerySort.create(StandardModelFields.UPDATED_AT, SortDirection.DESC));
79
+ }
74
80
  }
75
81
  matches(query) {
76
82
  if (query instanceof _a) {
@@ -1 +1 @@
1
- {"version":3,"file":"SimpleQuery.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQuery.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SimpleQuery.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQuery.tsx"],"names":[],"mappings":"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"}
@@ -1,11 +1,30 @@
1
1
  import * as React from 'react';
2
+ import { useEffect, useRef } from 'react';
2
3
  import { themed, ioc, ScrollableDivCss, System, TableWidget, LoadingPanelWidget } from '@journeyapps-labs/reactor-mod';
3
4
  import { observer } from 'mobx-react';
4
5
  import { DataBrowserEntities } from '../../entities';
5
6
  export const PageResultsWidget = observer((props) => {
6
7
  const system = ioc.get(System);
7
8
  const rows = props.page.loading ? [] : props.page.asRows();
8
- return (React.createElement(S.Container, null,
9
+ const ref = useRef(null);
10
+ useEffect(() => {
11
+ if (!ref.current) {
12
+ return;
13
+ }
14
+ if (ref.current.scrollTop !== props.scrollTop) {
15
+ ref.current.scrollTop = props.scrollTop;
16
+ }
17
+ if (ref.current.scrollLeft !== props.scrollLeft) {
18
+ ref.current.scrollLeft = props.scrollLeft;
19
+ }
20
+ }, [props.scrollLeft, props.scrollTop]);
21
+ return (React.createElement(S.Container, { ref: ref, onScroll: (event) => {
22
+ const target = event.currentTarget;
23
+ props.onScroll({
24
+ top: target.scrollTop,
25
+ left: target.scrollLeft
26
+ });
27
+ } },
9
28
  React.createElement(TableWidget, { onContextMenu: (event, row) => {
10
29
  system
11
30
  .getDefinition(DataBrowserEntities.SCHEMA_MODEL_OBJECT)
@@ -1 +1 @@
1
- {"version":3,"file":"PageResultsWidget.js","sourceRoot":"","sources":["../../../src/panels/query/PageResultsWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEvH,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAQrD,MAAM,CAAC,MAAM,iBAAiB,GAAqC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;IACpF,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAE3D,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS;QACV,oBAAC,WAAW,IACV,aAAa,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC5B,MAAM;qBACH,aAAa,CAAoB,mBAAmB,CAAC,mBAAmB,CAAC;qBACzE,wBAAwB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAChD,CAAC,EACD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,GACjC;QACD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CACpB,oBAAC,CAAC,CAAC,WAAW;YACZ,oBAAC,kBAAkB,IAAC,OAAO,EAAE,IAAI,IAAG,GAAG,EAAE,CAAC,IAAI,CAAsB,CACtD,CACjB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CACtB,oBAAC,CAAC,CAAC,UAAU,oCAAyC,CACvD,CAAC,CAAC,CAAC,IAAI,CACI,CACf,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAU,CAAC,CAwBV;AAxBD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;MAI/B,gBAAgB;GACnB,CAAC;IAEW,YAAU,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;aAKzB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS;;;GAGvC,CAAC;IAEW,aAAW,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKpC,CAAC;AACJ,CAAC,EAxBS,CAAC,KAAD,CAAC,QAwBV"}
1
+ {"version":3,"file":"PageResultsWidget.js","sourceRoot":"","sources":["../../../src/panels/query/PageResultsWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEvH,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAWrD,MAAM,CAAC,MAAM,iBAAiB,GAAqC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;IACpF,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC3D,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IAEzC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,EAAE,CAAC;YAC9C,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QAC1C,CAAC;QACD,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,KAAK,CAAC,UAAU,EAAE,CAAC;YAChD,GAAG,CAAC,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;QAC5C,CAAC;IACH,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IAExC,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS,IACV,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAClB,MAAM,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC;YACnC,KAAK,CAAC,QAAQ,CAAC;gBACb,GAAG,EAAE,MAAM,CAAC,SAAS;gBACrB,IAAI,EAAE,MAAM,CAAC,UAAU;aACxB,CAAC,CAAC;QACL,CAAC;QAED,oBAAC,WAAW,IACV,aAAa,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC5B,MAAM;qBACH,aAAa,CAAoB,mBAAmB,CAAC,mBAAmB,CAAC;qBACzE,wBAAwB,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAChD,CAAC,EACD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,GACjC;QACD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CACpB,oBAAC,CAAC,CAAC,WAAW;YACZ,oBAAC,kBAAkB,IAAC,OAAO,EAAE,IAAI,IAAG,GAAG,EAAE,CAAC,IAAI,CAAsB,CACtD,CACjB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CACtB,oBAAC,CAAC,CAAC,UAAU,oCAAyC,CACvD,CAAC,CAAC,CAAC,IAAI,CACI,CACf,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAU,CAAC,CAwBV;AAxBD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;MAI/B,gBAAgB;GACnB,CAAC;IAEW,YAAU,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;aAKzB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS;;;GAGvC,CAAC;IAEW,aAAW,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKpC,CAAC;AACJ,CAAC,EAxBS,CAAC,KAAD,CAAC,QAwBV"}
@@ -8,7 +8,8 @@ import { AbstractSerializableQuery } from '../../core/query/AbstractSerializable
8
8
  import { SavedQueryStore } from '../../stores/SavedQueryStore';
9
9
  import { SharedConnectionPanelFactory } from '../_shared/SharedConnectionPanelFactory';
10
10
  let QueryPanelModel = (() => {
11
- var _a, _QueryPanelModel_connStore_accessor_storage, _QueryPanelModel_query_accessor_storage, _QueryPanelModel_current_page_accessor_storage;
11
+ var _a, _QueryPanelModel_connStore_accessor_storage, _QueryPanelModel_query_accessor_storage, _QueryPanelModel_current_page_accessor_storage, _QueryPanelModel_current_page_data_accessor_storage, _QueryPanelModel_table_scroll_top_accessor_storage, _QueryPanelModel_table_scroll_left_accessor_storage;
12
+ var _b;
12
13
  let _classSuper = ReactorPanelModel;
13
14
  let _connStore_decorators;
14
15
  let _connStore_initializers = [];
@@ -19,6 +20,9 @@ let QueryPanelModel = (() => {
19
20
  let _current_page_decorators;
20
21
  let _current_page_initializers = [];
21
22
  let _current_page_extraInitializers = [];
23
+ let _current_page_data_decorators;
24
+ let _current_page_data_initializers = [];
25
+ let _current_page_data_extraInitializers = [];
22
26
  return _a = class QueryPanelModel extends _classSuper {
23
27
  get connStore() { return __classPrivateFieldGet(this, _QueryPanelModel_connStore_accessor_storage, "f"); }
24
28
  set connStore(value) { __classPrivateFieldSet(this, _QueryPanelModel_connStore_accessor_storage, value, "f"); }
@@ -26,15 +30,26 @@ let QueryPanelModel = (() => {
26
30
  set query(value) { __classPrivateFieldSet(this, _QueryPanelModel_query_accessor_storage, value, "f"); }
27
31
  get current_page() { return __classPrivateFieldGet(this, _QueryPanelModel_current_page_accessor_storage, "f"); }
28
32
  set current_page(value) { __classPrivateFieldSet(this, _QueryPanelModel_current_page_accessor_storage, value, "f"); }
33
+ get current_page_data() { return __classPrivateFieldGet(this, _QueryPanelModel_current_page_data_accessor_storage, "f"); }
34
+ set current_page_data(value) { __classPrivateFieldSet(this, _QueryPanelModel_current_page_data_accessor_storage, value, "f"); }
35
+ get table_scroll_top() { return __classPrivateFieldGet(this, _QueryPanelModel_table_scroll_top_accessor_storage, "f"); }
36
+ set table_scroll_top(value) { __classPrivateFieldSet(this, _QueryPanelModel_table_scroll_top_accessor_storage, value, "f"); }
37
+ get table_scroll_left() { return __classPrivateFieldGet(this, _QueryPanelModel_table_scroll_left_accessor_storage, "f"); }
38
+ set table_scroll_left(value) { __classPrivateFieldSet(this, _QueryPanelModel_table_scroll_left_accessor_storage, value, "f"); }
29
39
  constructor(query) {
30
40
  super(QueryPanelFactory.TYPE);
31
41
  _QueryPanelModel_connStore_accessor_storage.set(this, __runInitializers(this, _connStore_initializers, void 0));
32
42
  _QueryPanelModel_query_accessor_storage.set(this, (__runInitializers(this, _connStore_extraInitializers), __runInitializers(this, _query_initializers, void 0)));
33
43
  _QueryPanelModel_current_page_accessor_storage.set(this, (__runInitializers(this, _query_extraInitializers), __runInitializers(this, _current_page_initializers, void 0)));
34
- __runInitializers(this, _current_page_extraInitializers);
44
+ _QueryPanelModel_current_page_data_accessor_storage.set(this, (__runInitializers(this, _current_page_extraInitializers), __runInitializers(this, _current_page_data_initializers, void 0)));
45
+ _QueryPanelModel_table_scroll_top_accessor_storage.set(this, __runInitializers(this, _current_page_data_extraInitializers));
46
+ _QueryPanelModel_table_scroll_left_accessor_storage.set(this, void 0);
35
47
  this.setExpand(true, true);
36
48
  this.query = query;
37
49
  this.current_page = 0;
50
+ this.current_page_data = null;
51
+ this.table_scroll_top = 0;
52
+ this.table_scroll_left = 0;
38
53
  }
39
54
  isSerializable() {
40
55
  return this.query instanceof AbstractSerializableQuery;
@@ -53,6 +68,7 @@ let QueryPanelModel = (() => {
53
68
  }
54
69
  decodeEntities(data) {
55
70
  this.query = data.query;
71
+ this.current_page_data = null;
56
72
  }
57
73
  async loadSavedQuery(id) {
58
74
  const query = await ioc.get(SavedQueryStore).loadSavedQuery(id);
@@ -60,6 +76,7 @@ let QueryPanelModel = (() => {
60
76
  return;
61
77
  }
62
78
  this.current_page = 0;
79
+ this.current_page_data = null;
63
80
  this.query = query;
64
81
  await query.load();
65
82
  }
@@ -67,15 +84,20 @@ let QueryPanelModel = (() => {
67
84
  _QueryPanelModel_connStore_accessor_storage = new WeakMap(),
68
85
  _QueryPanelModel_query_accessor_storage = new WeakMap(),
69
86
  _QueryPanelModel_current_page_accessor_storage = new WeakMap(),
87
+ _QueryPanelModel_current_page_data_accessor_storage = new WeakMap(),
88
+ _QueryPanelModel_table_scroll_top_accessor_storage = new WeakMap(),
89
+ _QueryPanelModel_table_scroll_left_accessor_storage = new WeakMap(),
70
90
  (() => {
71
91
  var _b;
72
92
  const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create((_b = _classSuper[Symbol.metadata]) !== null && _b !== void 0 ? _b : null) : void 0;
73
93
  _connStore_decorators = [inject(ConnectionStore)];
74
94
  _query_decorators = [observable];
75
95
  _current_page_decorators = [observable];
96
+ _current_page_data_decorators = [(_b = observable).ref.bind(_b)];
76
97
  __esDecorate(_a, null, _connStore_decorators, { kind: "accessor", name: "connStore", static: false, private: false, access: { has: obj => "connStore" in obj, get: obj => obj.connStore, set: (obj, value) => { obj.connStore = value; } }, metadata: _metadata }, _connStore_initializers, _connStore_extraInitializers);
77
98
  __esDecorate(_a, null, _query_decorators, { kind: "accessor", name: "query", static: false, private: false, access: { has: obj => "query" in obj, get: obj => obj.query, set: (obj, value) => { obj.query = value; } }, metadata: _metadata }, _query_initializers, _query_extraInitializers);
78
99
  __esDecorate(_a, null, _current_page_decorators, { kind: "accessor", name: "current_page", static: false, private: false, access: { has: obj => "current_page" in obj, get: obj => obj.current_page, set: (obj, value) => { obj.current_page = value; } }, metadata: _metadata }, _current_page_initializers, _current_page_extraInitializers);
100
+ __esDecorate(_a, null, _current_page_data_decorators, { kind: "accessor", name: "current_page_data", static: false, private: false, access: { has: obj => "current_page_data" in obj, get: obj => obj.current_page_data, set: (obj, value) => { obj.current_page_data = value; } }, metadata: _metadata }, _current_page_data_initializers, _current_page_data_extraInitializers);
79
101
  if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
80
102
  })(),
81
103
  _a;
@@ -1 +1 @@
1
- {"version":3,"file":"QueryPanelFactory.js","sourceRoot":"","sources":["../../../src/panels/query/QueryPanelFactory.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryPanelFactory.js","sourceRoot":"","sources":["../../../src/panels/query/QueryPanelFactory.tsx"],"names":[],"mappings":"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"}
@@ -15,26 +15,32 @@ var S;
15
15
  `;
16
16
  })(S || (S = {}));
17
17
  export const QueryPanelWidget = observer((props) => {
18
- const [displayPage, setDisplayPage] = useState(null);
19
18
  const [loading, setLoading] = useState(false);
20
- const displayPageRef = useRef(null);
21
19
  const pendingDisposerRef = useRef(null);
22
20
  const setVisiblePage = (page) => {
23
- displayPageRef.current = page;
24
- setDisplayPage(page);
21
+ props.model.current_page_data = page;
25
22
  };
26
23
  useEffect(() => {
27
- if (!props.model.query) {
28
- return;
29
- }
30
- props.model.query.load();
31
- }, [props.model.query]);
24
+ return autorun(() => {
25
+ const query = props.model.query;
26
+ if (!query) {
27
+ return;
28
+ }
29
+ if (props.model.current_page_data) {
30
+ return;
31
+ }
32
+ if (query.totalPages !== 0) {
33
+ return;
34
+ }
35
+ void query.load();
36
+ });
37
+ }, [props.model]);
32
38
  useEffect(() => {
33
39
  return autorun(() => {
34
40
  var _a, _b;
35
41
  if (props.model.query) {
36
42
  const nextPage = props.model.query.getPage(props.model.current_page);
37
- const currentPage = displayPageRef.current;
43
+ const currentPage = props.model.current_page_data;
38
44
  if (!currentPage) {
39
45
  setVisiblePage(nextPage);
40
46
  setLoading(!!(nextPage === null || nextPage === void 0 ? void 0 : nextPage.loading));
@@ -64,7 +70,7 @@ export const QueryPanelWidget = observer((props) => {
64
70
  });
65
71
  }
66
72
  });
67
- }, [props.model.query]);
73
+ }, [props.model]);
68
74
  useEffect(() => {
69
75
  return () => {
70
76
  var _a;
@@ -72,7 +78,7 @@ export const QueryPanelWidget = observer((props) => {
72
78
  pendingDisposerRef.current = null;
73
79
  };
74
80
  }, []);
75
- const activePage = displayPage || (props.model.query ? props.model.query.getPage(props.model.current_page) : null);
81
+ const activePage = props.model.current_page_data || (props.model.query ? props.model.query.getPage(props.model.current_page) : null);
76
82
  return (React.createElement(LoadingPanelWidget, { loading: !props.model.query || !activePage }, () => {
77
83
  return (React.createElement(S.Container, null,
78
84
  React.createElement(BorderLayoutWidget, { top: React.createElement(TableControlsWidget, { query: props.model.query, current_page: activePage, loading: loading, onLoadSavedQuery: async (id) => {
@@ -84,7 +90,10 @@ export const QueryPanelWidget = observer((props) => {
84
90
  }, goToPage: (index) => {
85
91
  props.model.current_page = index;
86
92
  } }) },
87
- React.createElement(PageResultsWidget, { query: props.model.query, page: activePage }))));
93
+ React.createElement(PageResultsWidget, { query: props.model.query, page: activePage, scrollTop: props.model.table_scroll_top, scrollLeft: props.model.table_scroll_left, onScroll: ({ top, left }) => {
94
+ props.model.table_scroll_top = top;
95
+ props.model.table_scroll_left = left;
96
+ } }))));
88
97
  }));
89
98
  });
90
99
  //# sourceMappingURL=QueryPanelWidget.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"QueryPanelWidget.js","sourceRoot":"","sources":["../../../src/panels/query/QueryPanelWidget.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryPanelWidget.js","sourceRoot":"","sources":["../../../src/panels/query/QueryPanelWidget.tsx"],"names":[],"mappings":"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"}