chem-generic-ui 0.1.37 → 0.1.40

package/.babelrc

@@ -1,11 +1,5 @@
 {
-  "presets": ["@babel/preset-env", "@babel/preset-react","react-app"],
-  "plugins": [
-    "babel-plugin-transform-react-class-to-function",
-    "@babel/plugin-proposal-object-rest-spread",
-    "@babel/plugin-transform-classes",
-    "@babel/plugin-transform-react-jsx"
-  ]
+  "presets": ["@babel/preset-env", "@babel/preset-react","react-app"]
 }
 
 // "plugins": [

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "chem-generic-ui",
-  "version": "0.1.37",
+  "version": "0.1.40",
   "private": false,
   "author": "",
   "license": "MIT",
   "main": "index.js",
   "scripts": {
     "start": "webpack serve --config ./webpack.config.js --mode development",
-    "build": "webpack --config ./webpack.config.js --mode development",
+    "build": "webpack --config ./webpack.config.js --mode production",
     "test": "echo \"Error: no test specified\" && exit 0"
   },
   "keywords": [],
@@ -16,8 +16,6 @@
     "@babel/core": "^7.17.7",
     "@babel/eslint-parser": "^7.15.0",
     "@babel/node": "^7.16.8",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.7",
     "babel-eslint": "^10.1.0",
@@ -34,12 +32,10 @@
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-react": "^7.4.0",
     "eslint-plugin-react-hooks": "^4.3.0",
-    "html-webpack-plugin": "^5.5.0",
     "prettier": "^2.1.2",
     "react-hot-loader": "^4.13.0",
     "redux-logger": "^3.0.6",
     "webpack": "^5.70.0",
-    "webpack-bundle-analyzer": "^3.9.0",
     "webpack-cli": "^4.9.2",
     "webpack-dev-server": "^4.7.4"
   },
@@ -80,9 +76,6 @@
     "sass": "^1.49.9",
     "sass-loader": "^12.6.0",
     "style-loader": "^3.3.1",
-    "uuid": "^8.3.2",
-    "webpack": "^5.70.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "^4.7.4"
+    "uuid": "^8.3.2"
   }
 }

package/src/components/admin/ElementManager.js

@@ -16,7 +16,7 @@ const ElementManager = () => {
   return (
     <div>
       <p>You clicked {count} times</p>
-      <Button bsStyle="primary" onClick={() => setCount(count + 1)}>
+      <Button variant="primary" onClick={() => setCount(count + 1)}>
         Click me
       </Button>
     </div>

package/src/components/dnd/PanelDnD.js

@@ -53,18 +53,18 @@ const PanelDnD = ({
   const klz = (style || 'panel_generic_heading').replace('panel_generic_heading', 'panel_generic_heading_slim');
   const btnAdd = (
     <OverlayTrigger delayShow={1000} placement="top" overlay={<Tooltip id="_tooltip_add_layer">add layer</Tooltip>}>
-      <Button bsSize="xsmall" onClick={event => handleChange(event, id, layer, 'layer-modal')}><FontAwesomeIcon icon="fas fa-plus" /></Button>
+      <Button size="sm" onClick={event => handleChange(event, id, layer, 'layer-modal')}><FontAwesomeIcon icon="fas fa-plus" /></Button>
     </OverlayTrigger>
   );
   const btnRemove = (
     <OverlayTrigger delayShow={1000} placement="top" overlay={<Tooltip id="_tooltip_remove_layer">remove layer</Tooltip>}>
-      <Button bsSize="xsmall" onClick={event => handleChange(event, id, layer, 'layer-remove')}><FontAwesomeIcon icon="fas fa-minus" /></Button>
+      <Button size="sm" onClick={event => handleChange(event, id, layer, 'layer-remove')}><FontAwesomeIcon icon="fas fa-minus" /></Button>
     </OverlayTrigger>
   );
   const wfIcon = wf ? (<span>&nbsp;<FontAwesomeIcon icon="fas fa-sitemap" /></span>) : null;
   const moveIcon = (
     <OverlayTrigger delayShow={1000} placement="top" overlay={<Tooltip id={uuid()}>drag and drop to move position</Tooltip>}>
-      <Button onClick={() => {}} bsSize="xsmall"><FontAwesomeIcon icon="fas fa-arrows-alt" /></Button>
+      <Button onClick={() => {}} size="sm"><FontAwesomeIcon icon="fas fa-arrows-alt" /></Button>
     </OverlayTrigger>);
   const btnLayer = wf ? (<ButtonGroup className="pull-right" >{btnAdd}</ButtonGroup>) : (<ButtonGroup className="pull-right" >{btnAdd}{btnRemove}{moveIcon}</ButtonGroup>);
   const extHead = (/\./g.test(key)) ? <>({key}{wfIcon})</> : null;

package/src/components/fields/ButtonConfirm.js

@@ -10,17 +10,17 @@ const ButtonConfirm = (props) => {
     <Popover id="popover-button-confirm">
       {msg} <br />
       <div className="btn-toolbar">
-        <Button bsSize="xsmall" bsStyle="danger" aria-hidden="true" onClick={() => fnClick(fnParams)}>
+        <Button size="sm" variant="danger" aria-hidden="true" onClick={() => fnClick(fnParams)}>
           Yes
         </Button><span>&nbsp;&nbsp;</span>
-        <Button bsSize="xsmall" bsStyle="warning">No</Button>
+        <Button size="sm" variant="warning">No</Button>
       </div>
     </Popover>
   );
 
   return (
     <OverlayTrigger animation placement={place} root trigger="focus" overlay={popover}>
-      <Button bsSize={size} bsStyle={bs} disabled={disabled}>
+      <Button size={size} variant={bs} disabled={disabled}>
         <i className={`fa ${fa}`} aria-hidden="true" />
       </Button>
     </OverlayTrigger>

package/src/components/fields/ButtonTooltip.js

@@ -12,7 +12,7 @@ const ButtonTooltip = (props) => {
   if (bs === '') {
     return (
       <OverlayTrigger delayShow={1000} placement={place} overlay={tip} >
-        <Button bsSize={size} onClick={() => fnClick(element)} disabled={disabled}>
+        <Button size={size} onClick={() => fnClick(element)} disabled={disabled}>
           {content}<i className={`fa ${fa}`} aria-hidden="true" />
         </Button>
       </OverlayTrigger>
@@ -20,7 +20,7 @@ const ButtonTooltip = (props) => {
   }
   return (
     <OverlayTrigger delayShow={1000} placement={place} overlay={tip} >
-      <Button bsSize={size} bsStyle={bs} onClick={() => fnClick(element)} disabled={disabled}>
+      <Button size={size} variant={bs} onClick={() => fnClick(element)} disabled={disabled}>
         {content}<i className={`fa ${fa}`} aria-hidden="true" />
       </Button>
     </OverlayTrigger>

package/src/components/fields/GenPropertiesFields.js

@@ -101,7 +101,7 @@ const GenPropertiesInputGroup = (opt) => {
     <span key={`${e.id}_GenPropertiesInputGroup`} className="input-group" style={{ width: '100%' }}>
       <FormControl key={e.id} type="number" name={e.id} value={e.value} onChange={o => opt.onSubChange(o, e.id, opt.f_obj)} min={1} />
       <InputGroup.Button>
-        <Button active onClick={() => opt.onSubChange(e, e.id, opt.f_obj)} bsStyle="success">
+        <Button active onClick={() => opt.onSubChange(e, e.id, opt.f_obj)} variant="success">
           {genUnitSup(genUnit(e.option_layers, e.value_system).label) || ''}
         </Button>
       </InputGroup.Button>
@@ -252,7 +252,7 @@ const GenTextFormula = (opt) => {
 
 const renderListGroupItem = (opt, attachment) => {
   const delBtn = (
-    <Button bsSize="xsmall" id={attachment.uid} className="button-right" onClick={() => opt.onChange({ ...opt.value, action: 'd', uid: attachment.uid })}>
+    <Button size="xsmall" id={attachment.uid} className="button-right" onClick={() => opt.onChange({ ...opt.value, action: 'd', uid: attachment.uid })}>
       <i className="fa fa-times" aria-hidden="true" />
     </Button>
   );

package/src/components/layers/LayerModal.js

@@ -10,7 +10,7 @@ const block = (layer, fnAdd) => (
     <div>
       <div><b>{layer.label}</b><br />({layer.key})</div>
       <OverlayTrigger delayShow={1000} placement="top" overlay={<Tooltip id="_tooltip_layers">click to add layer</Tooltip>}>
-        <Button bsStyle="primary" onClick={event => fnAdd(event, layer)}><FontAwesomeIcon icon="fas fa-plus" /></Button>
+        <Button variant="primary" onClick={event => fnAdd(event, layer)}><FontAwesomeIcon icon="fas fa-plus" /></Button>
       </OverlayTrigger>
     </div>
   </div>

package/src/components/table/GenericElTableDropTarget.js

@@ -23,7 +23,7 @@ const base = (opt, iconClass, onDrop = () => {}, params = {}) => {
         </OverlayTrigger>
         <div className="del_btn">
           <OverlayTrigger delayShow={1000} placement="top" overlay={<Tooltip id={uuid()}>remove this molecule</Tooltip>}>
-            <Button className="btn_del" bsSize="xsmall" onClick={() => onDrop({}, params)} ><i className="fa fa-trash-o" aria-hidden="true" /></Button>
+            <Button className="btn_del" size="xsmall" onClick={() => onDrop({}, params)} ><i className="fa fa-trash-o" aria-hidden="true" /></Button>
           </OverlayTrigger>
         </div>
       </div>

package/src/components/table/GridBtn.js

@@ -7,7 +7,7 @@ import GridDnD from '../dnd/GridDnD';
 
 const AddRowBtn = ({ addRow }) => (
   <OverlayTrigger delayShow={1000} placement="top" overlay={<Tooltip id={uuid()}>add entry</Tooltip>}>
-    <Button onClick={() => addRow()} bsSize="xsmall" bsStyle="primary"><i className="fa fa-plus" aria-hidden="true" /></Button>
+    <Button onClick={() => addRow()} size="sm" variant="primary"><i className="fa fa-plus" aria-hidden="true" /></Button>
   </OverlayTrigger>
 );
 
@@ -17,7 +17,7 @@ const DelRowBtn = ({ delRow, node }) => {
   const { data } = node;
   return (
     <OverlayTrigger delayShow={1000} placement="top" overlay={<Tooltip id={uuid()}>remove</Tooltip>}>
-      <Button onClick={() => delRow(data)} bsSize="xsmall"><i className="fa fa-times" aria-hidden="true" /></Button>
+      <Button onClick={() => delRow(data)} size="sm"><i className="fa fa-times" aria-hidden="true" /></Button>
     </OverlayTrigger>);
 };
 

package/src/components/table/UConverterRenderer.js

@@ -9,7 +9,7 @@ const UConverterRenderer = (props) => {
   if (sField.type !== 'system-defined') return null;
   const { data } = node;
   return (
-    <Button key={`ucr_${data.id}`} active onClick={() => onChange(sField, node)} bsStyle="success">
+    <Button key={`ucr_${data.id}`} active onClick={() => onChange(sField, node)} variant="success">
       {genUnitSup(genUnit(sField.option_layers, data[sField.id].value_system).label) || ''}
     </Button>
   );

package/webpack.config.js

@@ -1,8 +1,5 @@
 const path = require('path');
 const webpack = require('webpack');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-
 
 module.exports = {
   entry: {
@@ -44,7 +41,6 @@ module.exports = {
     path: path.resolve(__dirname, './dist'),
     filename: 'bundle.js',
   },
-  plugins: [new HtmlWebpackPlugin({ template: './src/index.html' })],
   devServer: {
     static: path.resolve(__dirname, './dist'),
     hot: true,