@fto-consult/expo-ui 2.34.0 → 2.34.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/package.json
CHANGED
|
@@ -12,7 +12,6 @@ import BottomSheet from "$ecomponents/BottomSheet/Provider";
|
|
|
12
12
|
import {isMobileMedia} from "$cplatform/dimensions";
|
|
13
13
|
import {isNativeMobile} from "$cplatform";
|
|
14
14
|
import Icon,{MENU_ICON} from "$ecomponents/Icon";
|
|
15
|
-
import SimpleSelect from "$ecomponents/SimpleSelect";
|
|
16
15
|
import Dropdown from "$ecomponents/Dropdown";
|
|
17
16
|
import React from "$react";
|
|
18
17
|
import Footer from "../Footer/Footer";
|
|
@@ -21,13 +20,14 @@ import CommonTableDatagrid from "../Common/TableData";
|
|
|
21
20
|
import BackToTop from "$ecomponents/BackToTop";
|
|
22
21
|
import FiltersAccordionComponent from "./Filters";
|
|
23
22
|
import RenderType from "../RenderType";
|
|
24
|
-
import { flatMode
|
|
25
|
-
import
|
|
23
|
+
import { flatMode} from "$ecomponents/TextField";
|
|
24
|
+
import {FlashList} from "$ecomponents/List";
|
|
26
25
|
import theme,{Colors} from "$theme";
|
|
27
26
|
import {getRowStyle,styles as rStyles} from "../utils";
|
|
28
27
|
import Avatar from "$ecomponents/Avatar";
|
|
29
28
|
import {defaultObj,isOb,isNonNullString} from "$utils";
|
|
30
29
|
import PropTypes from "prop-types";
|
|
30
|
+
import {isTouchDevice} from "$platform";
|
|
31
31
|
|
|
32
32
|
const DatagridFactory = (Factory)=>{
|
|
33
33
|
Factory = Factory || CommonDatagrid;
|
|
@@ -431,7 +431,7 @@ const DatagridFactory = (Factory)=>{
|
|
|
431
431
|
} = this.preparedColumns;
|
|
432
432
|
const hasFootersFields = this.hasFootersFields();
|
|
433
433
|
const datagridHeader = <View testID={testID+"_HeaderContainer"} pointerEvents={pointerEvents} style={[styles.datagridHeader]}>
|
|
434
|
-
<ScrollView testID={testID+"_HeaderScrollView"} horizontal contentContainerStyle={StyleSheet.flatten([styles.contentContainerStyle,styles.minW100])}>
|
|
434
|
+
<ScrollView testID={testID+"_HeaderScrollView"} horizontal showsHorizontalScrollIndicator = {!isTouchDevice()} contentContainerStyle={StyleSheet.flatten([styles.contentContainerStyle,styles.minW100])}>
|
|
435
435
|
<View testID={testID+"_HeaderContentCntainer"} style={[styles.table,styles.pullRight]}>
|
|
436
436
|
{dbSelector}
|
|
437
437
|
<View testID={testID+"_HeaderQueryLimit"} style={[styles.paginationItem]}>
|
|
@@ -568,7 +568,7 @@ const DatagridFactory = (Factory)=>{
|
|
|
568
568
|
{!canRenderChart && showFooters ? (
|
|
569
569
|
<View testID={testID+"_FooterContainer"} pointerEvents={pointerEvents} style={[theme.styles.justifyContentCenter,theme.styles.pv1]}>
|
|
570
570
|
<View testID={testID+"_FooterContentContainer"} style={[styles.footersContainer]}>
|
|
571
|
-
<ScrollView testID={testID+"_FooterScrollView"} horizontal contentContainerStyle={[styles.contentContainerStyle]}>
|
|
571
|
+
<ScrollView testID={testID+"_FooterScrollView"} horizontal showsHorizontalScrollIndicator = {!isTouchDevice()} contentContainerStyle={[styles.contentContainerStyle]}>
|
|
572
572
|
<View testID={testID+"_FooterContent"} style={[styles.table,theme.styles.p1]}>
|
|
573
573
|
{Object.mapToArray(this.getFooterValues(),(footer,field)=>{
|
|
574
574
|
return <Footer
|
|
@@ -27,6 +27,7 @@ const ScrollViewComponent = React.forwardRef((props,ref) => {
|
|
|
27
27
|
},[])
|
|
28
28
|
return virtualized ? <FlatList
|
|
29
29
|
{...rest}
|
|
30
|
+
showsHorizontalScrollIndicator = {!isTouchDevice()} showsVerticalScrollIndicator={!isTouchDevice()}
|
|
30
31
|
ref = {ref}
|
|
31
32
|
testID = {testID}
|
|
32
33
|
data={[]}
|
|
@@ -36,7 +37,7 @@ const ScrollViewComponent = React.forwardRef((props,ref) => {
|
|
|
36
37
|
contentContainerStyle = {[!isNative && {flex:1,flexGrow: 1,maxHeight:Math.max(height-100,250)},rest.contentContainerStyle]}
|
|
37
38
|
ListHeaderComponent={() => <View testID={testID+'_FlatListContent'} {...cProps} mediaQueryUpdateNativeProps = {mediaQueryUpdateNativeProps}
|
|
38
39
|
>{children}</View>}
|
|
39
|
-
/> : <ScrollView ref={ref} {...rest} testID={testID} children={children}/>
|
|
40
|
+
/> : <ScrollView showsHorizontalScrollIndicator = {!isTouchDevice()} showsVerticalScrollIndicator={!isTouchDevice()} ref={ref} {...rest} testID={testID} children={children}/>
|
|
40
41
|
});
|
|
41
42
|
|
|
42
43
|
ScrollViewComponent.displayName = "ScrollViewComponent";
|