@agilemotion/oui-react-js 1.8.13 → 1.8.14

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.
@@ -91,7 +91,7 @@ const BasicAppHome = props => {
91
91
  }, true);
92
92
  };
93
93
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !_Utils.default.isNull(dashboardSettings) && /*#__PURE__*/_react.default.createElement("div", {
94
- className: `${"main w-100 h-100 d-inline-block " + dashboardSettings.systemProfileDto.organisation.code.toLowerCase() + "-skin"}`
94
+ className: `main w-100 h-100 d-inline-block ${dashboardSettings.systemProfileDto.organisation.code.toLowerCase()}-skin`
95
95
  }, /*#__PURE__*/_react.default.createElement("div", {
96
96
  className: "w-100 h-100"
97
97
  }, /*#__PURE__*/_react.default.createElement(_react2.ThemeProvider, {
@@ -114,12 +114,37 @@ const BasicAppHome = props => {
114
114
  secondary: {
115
115
  main: dashboardSettings.systemProfileDto.secondCorporateBrandColor
116
116
  }
117
+ },
118
+ components: {
119
+ MuiCssBaseline: {
120
+ styleOverrides: {
121
+ body: {
122
+ // Firefox
123
+ scrollbarColor: 'rgba(100, 100, 100, 0.4) transparent',
124
+ scrollbarWidth: 'thin'
125
+ },
126
+ // WebKit browsers
127
+ '::-webkit-scrollbar': {
128
+ width: '8px',
129
+ height: '8px'
130
+ },
131
+ '::-webkit-scrollbar-track': {
132
+ background: 'transparent'
133
+ },
134
+ '::-webkit-scrollbar-thumb': {
135
+ backgroundColor: 'rgba(100, 100, 100, 0.4)',
136
+ borderRadius: '4px',
137
+ transition: 'background-color 0.3s'
138
+ },
139
+ '::-webkit-scrollbar-thumb:hover': {
140
+ backgroundColor: 'rgba(100, 100, 100, 0.6)'
141
+ }
142
+ }
143
+ }
117
144
  }
118
145
  })
119
146
  }, /*#__PURE__*/_react.default.createElement(_material.CssBaseline, null), /*#__PURE__*/_react.default.createElement(_FoldingSideTabDashboard.default, {
120
- logoutCallBack: () => {
121
- logout();
122
- },
147
+ logoutCallBack: () => logout(),
123
148
  settings: dashboardSettings,
124
149
  avatar: avatarUrl,
125
150
  logo: dashboardSettings.logo,
@@ -284,14 +284,23 @@ const FoldingSideTabDashboard = props => {
284
284
  toggleSidebar: toggleSidebar,
285
285
  logoutCallBack: props.logoutCallBack
286
286
  })), ' ', /*#__PURE__*/_react.default.createElement("div", {
287
- className: "content w-100 h-100"
287
+ className: "content",
288
+ style: {
289
+ height: "calc(100vh - 70px)",
290
+ maxHeight: "calc(100vh - 70px)"
291
+ }
288
292
  }, /*#__PURE__*/_react.default.createElement("div", {
289
293
  className: "content w-100 h-100 row no-margin no-padding"
290
294
  }, /*#__PURE__*/_react.default.createElement("div", {
291
295
  style: {
292
- width: windowPinned ? 'calc(100% - 320px)' : '100%'
296
+ width: '100%',
297
+ height: "100%",
298
+ mxHeight: "100%",
299
+ overflow: 'auto'
293
300
  }
294
- }, /*#__PURE__*/_react.default.createElement(_ViewPort.default, null)), /*#__PURE__*/_react.default.createElement("div", {
301
+ }, /*#__PURE__*/_react.default.createElement(_ViewPort.default, {
302
+ windowPinned: windowPinned
303
+ })), /*#__PURE__*/_react.default.createElement("div", {
295
304
  className: 'col no-margin no-padding',
296
305
  style: {
297
306
  width: windowPinned ? '320px' : '0'
@@ -317,7 +317,7 @@ class FoldingTabSidebar extends _react.default.Component {
317
317
  className: this.props.className,
318
318
  data: activeColor,
319
319
  style: {
320
- overflow: 'auto',
320
+ overflow: 'hidden',
321
321
  maxHeight: '100vh'
322
322
  }
323
323
  }, /*#__PURE__*/_react.default.createElement("table", {
@@ -11,7 +11,7 @@ var _ApplicationManager = _interopRequireDefault(require("../../ApplicationManag
11
11
  var _ConfirmationDialog = require("../ConfirmationDialog");
12
12
  var _PopupView = _interopRequireDefault(require("../PopupView"));
13
13
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
14
- const ViewPort = () => {
14
+ const ViewPort = props => {
15
15
  const navigate = (0, _reactRouterDom.useNavigate)();
16
16
  const [loading, setLoading] = _react.default.useState(true);
17
17
  const confirmationDialogController = _react.default.useRef({});
@@ -42,7 +42,10 @@ const ViewPort = () => {
42
42
  }, []);
43
43
  return /*#__PURE__*/_react.default.createElement("div", {
44
44
  style: {
45
- height: 'calc(100vh - 90px)'
45
+ height: 'calc(100vh - 96px)',
46
+ maxHeight: 'calc(100vh - 96px)',
47
+ position: props.windowPinned ? 'relative' : 'fixed',
48
+ width: props.windowPinned ? '100%' : 'calc(100% - 348px)'
46
49
  }
47
50
  }, /*#__PURE__*/_react.default.createElement(_PopupView.default, {
48
51
  controller: popupViewController.current
@@ -4,26 +4,35 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.default = void 0;
7
- var _react = _interopRequireDefault(require("react"));
7
+ var _react = _interopRequireWildcard(require("react"));
8
8
  var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles"));
9
9
  var _Dialog = _interopRequireDefault(require("@mui/material/Dialog"));
10
10
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
11
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
12
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
11
13
  function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
12
14
  const withStyledDialog = Component => (0, _withStyles.default)(theme => ({
13
15
  root: {
14
- pointerEvents: "none"
16
+ pointerEvents: "none",
17
+ zIndex: 0,
18
+ left: 'unset',
19
+ border: '1px solid #e1e1e1',
20
+ borderRadius: '4px'
15
21
  },
16
22
  paper: props => ({
17
23
  pointerEvents: "auto",
18
- width: `calc(100% - ${props.leftOffset || "0px"})`,
24
+ width: `100%`,
19
25
  maxWidth: "100%",
20
- height: "calc(100% - 88px)",
26
+ height: "calc(100% - 112px)",
21
27
  position: "absolute",
28
+ overflow: 'hidden',
22
29
  margin: "8px",
23
30
  bottom: 0,
24
- right: 0,
25
- overflow: "hidden",
31
+ left: '164px',
32
+ top: '40px',
26
33
  borderRadius: 4,
34
+ boxShadow: "none",
35
+ zIndex: 0,
27
36
  "@media (max-width:991px)": {
28
37
  maxWidth: "100%"
29
38
  }
@@ -36,12 +45,14 @@ const withStyledDialog = Component => (0, _withStyles.default)(theme => ({
36
45
  } = _ref;
37
46
  return /*#__PURE__*/_react.default.createElement(Component, _extends({}, props, {
38
47
  classes: {
39
- paper: classes.paper
48
+ paper: classes.paper,
49
+ root: classes.root
40
50
  }
41
51
  }));
42
52
  });
43
53
  const StyledDialog = withStyledDialog(_Dialog.default);
44
54
  const WindowDialog = props => {
55
+ (0, _react.useEffect)(() => {}, []);
45
56
  return /*#__PURE__*/_react.default.createElement(StyledDialog, props);
46
57
  };
47
58
  var _default = exports.default = WindowDialog;
@@ -6,7 +6,7 @@
6
6
  top: 0;
7
7
  width: 100vw; /* Full width */
8
8
  height: 100vh; /* Full height */
9
- overflow: auto; /* Enable scroll if needed */
9
+ overflow: hidden; /* Enable scroll if needed */
10
10
  background-color: rgb(0,0,0); /* Fallback color */
11
11
  background-color: rgba(0,0,0,0.1); /* Black w/ opacity */
12
12
  }
@@ -25,7 +25,9 @@ const propHandler = state => {
25
25
  class HomeNavbar extends _react.default.Component {
26
26
  styles = {
27
27
  header: {
28
- backgroundColor: this.props.color
28
+ backgroundColor: this.props.color,
29
+ height: "72px",
30
+ minHeight: "72px"
29
31
  }
30
32
  };
31
33
  constructor(props) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agilemotion/oui-react-js",
3
- "version": "1.8.13",
3
+ "version": "1.8.14",
4
4
  "files": [
5
5
  "dist"
6
6
  ],