@onehat/ui 0.3.25 → 0.3.27

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.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/Components/Container/ScreenContainer.js +2 -2
  3. package/src/Components/Form/Form.js +2 -2
  4. package/src/Functions/getTokenHeaders.js +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onehat/ui",
3
- "version": "0.3.25",
3
+ "version": "0.3.27",
4
4
  "description": "Base UI for OneHat apps",
5
5
  "main": "src/index.js",
6
6
  "type": "module",
package/src/Components/Container/ScreenContainer.js CHANGED
@@ -8,7 +8,7 @@ import {
8
8
  ScrollView,
9
9
  KeyboardAvoidingView,
10
10
  } from 'native-base';
11
- import { useHeaderHeight } from '@react-navigation/elements';
11
+ // import { useHeaderHeight } from '@react-navigation/elements';
12
12
  // import testProps from '../OneHat/functions/testProps';
13
13
 
14
14
  export default function ScreenContainer(props) {
@@ -28,7 +28,7 @@ export default function ScreenContainer(props) {
28
28
  {
29
29
  height,
30
30
  } = useWindowDimensions(),
31
- headerHeight = subtractHeaderHeight ? useHeaderHeight() : 0,
31
+ headerHeight = 0,//subtractHeaderHeight ? useHeaderHeight() : 0,
32
32
  safeAreaProps = {};
33
33
  if (safeArea !== false) {
34
34
  safeAreaProps.safeArea = true;
package/src/Components/Form/Form.js CHANGED
@@ -593,7 +593,7 @@ function Form(props) {
593
593
 
594
594
  return <Column {...sizeProps} onLayout={onLayout}>
595
595
 
596
- <Row p={2} alignItems="center" justifyContent="flex-end">
596
+ <Row px={4} pt={4} alignItems="center" justifyContent="flex-end">
597
597
  {/* <Text mr={2} fontSize={18}>{editorModeF} Mode</Text> */}
598
598
  {isSingle && editorMode === EDITOR_MODE__EDIT && onBack &&
599
599
  <Button
@@ -611,7 +611,7 @@ function Form(props) {
611
611
  >To View</Button>}
612
612
  </Row>
613
613
  {editorMode === EDITOR_MODE__EDIT && !_.isEmpty(additionalEditButtons) &&
614
- <Row p={2} alignItems="center" justifyContent="flex-end">
614
+ <Row p={4} alignItems="center" justifyContent="flex-end">
615
615
  {additionalEditButtons}
616
616
  </Row>}
617
617
 
package/src/Functions/getTokenHeaders.js CHANGED
@@ -2,10 +2,10 @@ import UiGlobals from '../UiGlobals.js';
2
2
 
3
3
  export default function(clearAll = false) {
4
4
  const reduxState = UiGlobals.redux.getState();
5
- if (!reduxState.App.user || (!reduxState.App.user.token && !reduxState.App.user.users__token)) {
5
+ if (!reduxState.app.user || (!reduxState.app.user.token && !reduxState.app.user.users__token)) {
6
6
  return {};
7
7
  }
8
- const token = reduxState.App.user.token || reduxState.App.user.users__token;
8
+ const token = reduxState.app.user.token || reduxState.app.user.users__token;
9
9
  return {
10
10
  Authentication: clearAll ? null : `Token ${token}`,
11
11
  // Cookie: null,