diff --git a/README.md b/README.md
index 137c4ed..f313ac6 100644
--- a/README.md
+++ b/README.md
@@ -1,25 +1,17 @@
## Backhandler
-Widget to disregard back events on page when using Mendix Native.
+[Disregard back events on page]
+
+## Features
+[feature highlights]
## Usage
-For development:
-
-Create customwidgets folder in root of project directory
-Git clone this repo into customwidgets folder
-Open command prompt in cloned folder
-npm i
-npm run dev / npm run build
-Widget can now be used inside Mendix.
-
-For plain usage:
-
-Copy MPK file in releases to widgets directory.
+[step by step instructions]
## Demo project
-Not available yet.
+[link to sandbox]
## Issues, suggestions and feature requests
-https://github.com/IncentroBA/backhandler/issues
+[link to GitHub issues]
## Development and contribution
-N/A
+[specify contribute]
diff --git a/dist/1.0.0/incentro.Backhandler.mpk b/dist/1.0.0/incentro.Backhandler.mpk
index e755c03..8d8d586 100644
Binary files a/dist/1.0.0/incentro.Backhandler.mpk and b/dist/1.0.0/incentro.Backhandler.mpk differ
diff --git a/dist/tmp/widgets/Backhandler.xml b/dist/tmp/widgets/Backhandler.xml
index ed70a78..7d0de4e 100644
--- a/dist/tmp/widgets/Backhandler.xml
+++ b/dist/tmp/widgets/Backhandler.xml
@@ -7,14 +7,11 @@
Disregard back events on page
-
-
- Disable
- Boolean for enabling/disabling backhandler
-
-
-
+
+
+ On backpress
+ Flow to call when hardware backbutton is used.
-
+
diff --git a/dist/tmp/widgets/incentro/backhandler/Backhandler.js b/dist/tmp/widgets/incentro/backhandler/Backhandler.js
index efb6b77..2584a83 100644
--- a/dist/tmp/widgets/incentro/backhandler/Backhandler.js
+++ b/dist/tmp/widgets/incentro/backhandler/Backhandler.js
@@ -112,14 +112,14 @@ class Backhandler extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
return (Object(react__WEBPACK_IMPORTED_MODULE_0__["createElement"])(react_native__WEBPACK_IMPORTED_MODULE_1__["View"], null));
}
componentWillMount() {
- if (this.props.disableBack) {
- react_native__WEBPACK_IMPORTED_MODULE_1__["BackHandler"].addEventListener('hardwareBackPress', this.handleBackButtonClick);
- }
+ react_native__WEBPACK_IMPORTED_MODULE_1__["BackHandler"].addEventListener('hardwareBackPress', this.handleBackButtonClick);
}
componentWillUnmount() {
react_native__WEBPACK_IMPORTED_MODULE_1__["BackHandler"].removeEventListener('hardwareBackPress', this.handleBackButtonClick);
}
handleBackButtonClick() {
+ var _a;
+ (_a = this.props.onBack) === null || _a === void 0 ? void 0 : _a.execute();
return true;
}
}
diff --git a/dist/tmp/widgets/incentro/backhandler/Backhandler.js.map b/dist/tmp/widgets/incentro/backhandler/Backhandler.js.map
index 2029968..c738375 100644
--- a/dist/tmp/widgets/incentro/backhandler/Backhandler.js.map
+++ b/dist/tmp/widgets/incentro/backhandler/Backhandler.js.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/Backhandler.tsx","webpack:///external \"react\"","webpack:///external \"react-native\""],"names":[],"mappings":";;QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;;;;AClFA;AAAA;AAAA;AAAA;AAAA;AAAA;AAA4D;AACW;AAWhE,MAAM,WAAY,SAAQ,+CAAwC;IACrE,YAAY,KAAoC;QAC5C,KAAK,CAAC,KAAK,CAAC;QACZ,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC;IAED,MAAM;QACF,OAAO,CACP,4DAAC,iDAAI,OAAQ,CACZ;IACL,CAAC;IAED,kBAAkB;QACd,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YACxB,wDAAW,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;SACjF;IACL,CAAC;IAED,oBAAoB;QAChB,wDAAW,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACrF,CAAC;IAED,qBAAqB;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;;;;;;;;;;;;ACrCD,kC;;;;;;;;;;;ACAA,yC","file":"widgets/incentro/backhandler/Backhandler.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./src/Backhandler.tsx\");\n","import { Component, ReactNode, createElement } from \"react\";\nimport { TextStyle, ViewStyle, BackHandler, View } from \"react-native\";\n\nimport { Style } from \"@mendix/pluggable-widgets-tools\";\n\nimport { BackhandlerProps } from \"../typings/BackhandlerProps\";\n\nexport interface CustomStyle extends Style {\n container: ViewStyle;\n label: TextStyle;\n}\n\nexport class Backhandler extends Component> {\n constructor(props: BackhandlerProps){\n super(props)\n this.handleBackButtonClick = this.handleBackButtonClick.bind(this);\n }\n\n render(): ReactNode {\n return (\n \n )\n }\n\n componentWillMount() {\n if (this.props.disableBack) {\n BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonClick);\n } \n }\n \n componentWillUnmount() {\n BackHandler.removeEventListener('hardwareBackPress', this.handleBackButtonClick);\n }\n \n handleBackButtonClick() {\n return true;\n }\n}\n\n","module.exports = require(\"react\");","module.exports = require(\"react-native\");"],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./src/Backhandler.tsx","webpack:///external \"react\"","webpack:///external \"react-native\""],"names":[],"mappings":";;QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;;;;AClFA;AAAA;AAAA;AAAA;AAAA;AAAA;AAA4D;AACW;AAWhE,MAAM,WAAY,SAAQ,+CAAwC;IACrE,YAAY,KAAoC;QAC5C,KAAK,CAAC,KAAK,CAAC;QACZ,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC;IAGD,MAAM;QACF,OAAO,CACP,4DAAC,iDAAI,OAAQ,CACZ;IACL,CAAC;IAED,kBAAkB;QACd,wDAAW,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAClF,CAAC;IAED,oBAAoB;QAChB,wDAAW,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACrF,CAAC;IAED,qBAAqB;;QACjB,UAAI,CAAC,KAAK,CAAC,MAAM,0CAAE,OAAO,GAAG;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;;;;;;;;;;;;ACrCD,kC;;;;;;;;;;;ACAA,yC","file":"widgets/incentro/backhandler/Backhandler.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./src/Backhandler.tsx\");\n","import { Component, ReactNode, createElement } from \"react\";\nimport { TextStyle, ViewStyle, BackHandler, View } from \"react-native\";\n\nimport { Style } from \"@mendix/pluggable-widgets-tools\";\n\nimport { BackhandlerProps } from \"../typings/BackhandlerProps\";\n\nexport interface CustomStyle extends Style {\n container: ViewStyle;\n label: TextStyle;\n}\n\nexport class Backhandler extends Component> {\n constructor(props: BackhandlerProps){\n super(props)\n this.handleBackButtonClick = this.handleBackButtonClick.bind(this);\n }\n\n //We have to have a render block, or else Mendix Native will crash. Render block is expected.\n render(): ReactNode {\n return (\n \n )\n }\n\n componentWillMount() {\n BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonClick);\n }\n \n componentWillUnmount() {\n BackHandler.removeEventListener('hardwareBackPress', this.handleBackButtonClick);\n }\n \n handleBackButtonClick() {\n this.props.onBack?.execute();\n return true;\n }\n}\n\n","module.exports = require(\"react\");","module.exports = require(\"react-native\");"],"sourceRoot":""}
\ No newline at end of file
diff --git a/src/Backhandler.tsx b/src/Backhandler.tsx
index f264961..311dc2b 100644
--- a/src/Backhandler.tsx
+++ b/src/Backhandler.tsx
@@ -16,6 +16,7 @@ export class Backhandler extends Component> {
this.handleBackButtonClick = this.handleBackButtonClick.bind(this);
}
+ //We have to have a render block, or else Mendix Native will crash. Render block is expected.
render(): ReactNode {
return (
@@ -23,9 +24,7 @@ export class Backhandler extends Component> {
}
componentWillMount() {
- if (this.props.disableBack) {
- BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonClick);
- }
+ BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonClick);
}
componentWillUnmount() {
@@ -33,6 +32,7 @@ export class Backhandler extends Component> {
}
handleBackButtonClick() {
+ this.props.onBack?.execute();
return true;
}
}
diff --git a/src/Backhandler.xml b/src/Backhandler.xml
index ed70a78..7d0de4e 100644
--- a/src/Backhandler.xml
+++ b/src/Backhandler.xml
@@ -7,14 +7,11 @@
Disregard back events on page
-
-
- Disable
- Boolean for enabling/disabling backhandler
-
-
-
+
+
+ On backpress
+ Flow to call when hardware backbutton is used.
-
+
diff --git a/typings/BackhandlerProps.d.ts b/typings/BackhandlerProps.d.ts
index ad4c08c..02e3c50 100644
--- a/typings/BackhandlerProps.d.ts
+++ b/typings/BackhandlerProps.d.ts
@@ -3,16 +3,16 @@
* WARNING: All changes made to this file will be overwritten
* @author Mendix UI Content Team
*/
-import { EditableValue } from "mendix";
+import { ActionValue } from "mendix";
export interface BackhandlerProps