Skip to content

Commit

Permalink
コンフリクト修正
Browse files Browse the repository at this point in the history
  • Loading branch information
@1000-x-t30
1000-x-t30 committed Oct 23, 2024
1 parent 88115eb commit 03d8c5d
Show file tree
Hide file tree
Showing 68 changed files with 8,127 additions and 47,758 deletions.
29,616 changes: 1 addition & 29,615 deletions dist/bundle.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/assets/images/add_column.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/assets/images/add_row.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions lib/components/FieldConfirmSource.js
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
'use strict';
"use strict";

var _interopRequireDefault = require('@babel/runtime/helpers/interopRequireDefault');
Object.defineProperty(exports, '__esModule', {
value: true,
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.FieldConfirmSource = FieldConfirmSource;
var _react = _interopRequireDefault(require('react'));
var _TableLayoutConfirm = require('./cofirmLayouts/TableLayoutConfirm');
var _react = _interopRequireDefault(require("react"));
var _TableLayoutConfirm = require("./cofirmLayouts/TableLayoutConfirm");
function FieldConfirmSource() {
return /*#__PURE__*/ _react.default.createElement(_TableLayoutConfirm.TableLayoutConfirm, null);
}
return /*#__PURE__*/_react.default.createElement(_TableLayoutConfirm.TableLayoutConfirm, null);
}
16 changes: 8 additions & 8 deletions lib/components/FieldGroupConfirmSource.js
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
'use strict';
"use strict";

var _interopRequireDefault = require('@babel/runtime/helpers/interopRequireDefault');
Object.defineProperty(exports, '__esModule', {
value: true,
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.FieldGroupConfirmSource = FieldGroupConfirmSource;
var _react = _interopRequireDefault(require('react'));
var _GroupTableLayoutConfirm = require('./cofirmLayouts/GroupTableLayoutConfirm');
var _react = _interopRequireDefault(require("react"));
var _GroupTableLayoutConfirm = require("./cofirmLayouts/GroupTableLayoutConfirm");
function FieldGroupConfirmSource() {
return /*#__PURE__*/ _react.default.createElement(_GroupTableLayoutConfirm.GroupTableLayoutConfirm, null);
}
return /*#__PURE__*/_react.default.createElement(_GroupTableLayoutConfirm.GroupTableLayoutConfirm, null);
}
29 changes: 13 additions & 16 deletions lib/components/FieldGroupSource.js
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
'use strict';
"use strict";

var _interopRequireDefault = require('@babel/runtime/helpers/interopRequireDefault');
Object.defineProperty(exports, '__esModule', {
value: true,
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.FieldGroupSource = FieldGroupSource;
var _react = _interopRequireDefault(require('react'));
var _GroupSection = require('./layouts/GroupSection');
var _GroupTableLayout = require('./layouts/GroupTableLayout');
var _MakerContext = require('../store/MakerContext');
var _react = _interopRequireDefault(require("react"));
var _GroupSection = require("./layouts/GroupSection");
var _GroupTableLayout = require("./layouts/GroupTableLayout");
var _MakerContext = require("../store/MakerContext");
function FieldGroupSource() {
const {
preview: { tag },
preview: {
tag
}
} = (0, _MakerContext.useMakerContext)();
return /*#__PURE__*/ _react.default.createElement(
_react.default.Fragment,
null,
tag === 'section' ? /*#__PURE__*/ _react.default.createElement(_GroupSection.GroupSection, null) : null,
tag === 'table' ? /*#__PURE__*/ _react.default.createElement(_GroupTableLayout.GroupTableLayout, null) : null
);
}
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, tag === 'section' ? /*#__PURE__*/_react.default.createElement(_GroupSection.GroupSection, null) : null, tag === 'table' ? /*#__PURE__*/_react.default.createElement(_GroupTableLayout.GroupTableLayout, null) : null);
}
29 changes: 13 additions & 16 deletions lib/components/FieldSource.js
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
'use strict';
"use strict";

var _interopRequireDefault = require('@babel/runtime/helpers/interopRequireDefault');
Object.defineProperty(exports, '__esModule', {
value: true,
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.FieldSource = FieldSource;
var _react = _interopRequireDefault(require('react'));
var _Section = require('./layouts/Section');
var _TableLayout = require('./layouts/TableLayout');
var _MakerContext = require('../store/MakerContext');
var _react = _interopRequireDefault(require("react"));
var _Section = require("./layouts/Section");
var _TableLayout = require("./layouts/TableLayout");
var _MakerContext = require("../store/MakerContext");
function FieldSource() {
const {
preview: { tag },
preview: {
tag
}
} = (0, _MakerContext.useMakerContext)();
return /*#__PURE__*/ _react.default.createElement(
_react.default.Fragment,
null,
tag === 'section' ? /*#__PURE__*/ _react.default.createElement(_Section.Section, null) : null,
tag === 'table' ? /*#__PURE__*/ _react.default.createElement(_TableLayout.TableLayout, null) : null
);
}
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, tag === 'section' ? /*#__PURE__*/_react.default.createElement(_Section.Section, null) : null, tag === 'table' ? /*#__PURE__*/_react.default.createElement(_TableLayout.TableLayout, null) : null);
}
129 changes: 44 additions & 85 deletions lib/components/ModalDialog.js
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,21 @@
'use strict';
"use strict";

var _interopRequireDefault = require('@babel/runtime/helpers/interopRequireDefault');
Object.defineProperty(exports, '__esModule', {
value: true,
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.ModalDialog = ModalDialog;
var _react = _interopRequireWildcard(require('react'));
var _classnames = _interopRequireDefault(require('classnames'));
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);
}
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;
}
var _react = _interopRequireWildcard(require("react"));
var _classnames = _interopRequireDefault(require("classnames"));
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); }
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; }
function ModalDialog(props) {
const { children, title, open, onClose = () => {} } = props;
const {
children,
title,
open,
onClose = () => {}
} = props;
const [show, setShow] = (0, _react.useState)(false);
const hideDialog = (0, _react.useCallback)(() => {
setShow(false);
Expand All @@ -49,60 +34,34 @@ function ModalDialog(props) {
hideDialog();
}
}, [open, hideDialog]);
return /*#__PURE__*/ _react.default.createElement(
'div',
{
className: (0, _classnames.default)('acms-admin-modal', {
in: show,
}),
id: 'converter',
'aria-hidden': show ? 'false' : 'true',
style: {
display: show ? 'block' : 'none',
},
return /*#__PURE__*/_react.default.createElement("div", {
className: (0, _classnames.default)('acms-admin-modal', {
in: show
}),
id: "converter",
"aria-hidden": show ? 'false' : 'true',
style: {
display: show ? 'block' : 'none'
}
}, /*#__PURE__*/_react.default.createElement("div", {
className: "acms-admin-modal-dialog"
}, /*#__PURE__*/_react.default.createElement("div", {
className: "acms-admin-modal-content"
}, /*#__PURE__*/_react.default.createElement("div", {
className: "acms-admin-modal-header"
}, /*#__PURE__*/_react.default.createElement("i", {
className: "acms-admin-modal-hide acms-admin-icon-delete",
onKeyDown: e => {
if (e.key === 'Enter' || e.key === ' ') {
hideDialog();
}
},
/*#__PURE__*/ _react.default.createElement(
'div',
{
className: 'acms-admin-modal-dialog',
},
/*#__PURE__*/ _react.default.createElement(
'div',
{
className: 'acms-admin-modal-content',
},
/*#__PURE__*/ _react.default.createElement(
'div',
{
className: 'acms-admin-modal-header',
},
/*#__PURE__*/ _react.default.createElement('i', {
className: 'acms-admin-modal-hide acms-admin-icon-delete',
onKeyDown: (e) => {
if (e.key === 'Enter' || e.key === ' ') {
hideDialog();
}
},
onClick: hideDialog,
role: 'button',
tabIndex: 0,
}),
/*#__PURE__*/ _react.default.createElement('h3', null, title)
),
/*#__PURE__*/ _react.default.createElement(
'div',
{
className: 'acms-admin-modal-body',
},
/*#__PURE__*/ _react.default.createElement(
'div',
{
className: 'acms-admin-padding-small clearfix',
},
children
)
)
)
)
);
}
onClick: hideDialog,
role: "button",
tabIndex: 0
}), /*#__PURE__*/_react.default.createElement("h3", null, title)), /*#__PURE__*/_react.default.createElement("div", {
className: "acms-admin-modal-body"
}, /*#__PURE__*/_react.default.createElement("div", {
className: "acms-admin-padding-small clearfix"
}, children)))));
}
16 changes: 8 additions & 8 deletions lib/components/UnitConfirmSource.js
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
'use strict';
"use strict";

var _interopRequireDefault = require('@babel/runtime/helpers/interopRequireDefault');
Object.defineProperty(exports, '__esModule', {
value: true,
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.UnitConfirmSource = UnitConfirmSource;
var _react = _interopRequireDefault(require('react'));
var _UnitTableLayoutConfirm = require('./cofirmLayouts/UnitTableLayoutConfirm');
var _react = _interopRequireDefault(require("react"));
var _UnitTableLayoutConfirm = require("./cofirmLayouts/UnitTableLayoutConfirm");
function UnitConfirmSource() {
return /*#__PURE__*/ _react.default.createElement(_UnitTableLayoutConfirm.UnitTableLayoutConfirm, null);
}
return /*#__PURE__*/_react.default.createElement(_UnitTableLayoutConfirm.UnitTableLayoutConfirm, null);
}
16 changes: 8 additions & 8 deletions lib/components/UnitGroupConfirmSource.js
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
'use strict';
"use strict";

var _interopRequireDefault = require('@babel/runtime/helpers/interopRequireDefault');
Object.defineProperty(exports, '__esModule', {
value: true,
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.UnitGroupConfirmSource = UnitGroupConfirmSource;
var _react = _interopRequireDefault(require('react'));
var _UnitGroupTableLayoutConfirm = require('./cofirmLayouts/UnitGroupTableLayoutConfirm');
var _react = _interopRequireDefault(require("react"));
var _UnitGroupTableLayoutConfirm = require("./cofirmLayouts/UnitGroupTableLayoutConfirm");
function UnitGroupConfirmSource() {
return /*#__PURE__*/ _react.default.createElement(_UnitGroupTableLayoutConfirm.UnitGroupTableLayoutConfirm, null);
}
return /*#__PURE__*/_react.default.createElement(_UnitGroupTableLayoutConfirm.UnitGroupTableLayoutConfirm, null);
}
31 changes: 13 additions & 18 deletions lib/components/UnitGroupSource.js
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
'use strict';
"use strict";

var _interopRequireDefault = require('@babel/runtime/helpers/interopRequireDefault');
Object.defineProperty(exports, '__esModule', {
value: true,
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.UnitGroupSource = UnitGroupSource;
var _react = _interopRequireDefault(require('react'));
var _UnitGroupSection = require('./layouts/UnitGroupSection');
var _UnitGroupTableLayout = require('./layouts/UnitGroupTableLayout');
var _MakerContext = require('../store/MakerContext');
var _react = _interopRequireDefault(require("react"));
var _UnitGroupSection = require("./layouts/UnitGroupSection");
var _UnitGroupTableLayout = require("./layouts/UnitGroupTableLayout");
var _MakerContext = require("../store/MakerContext");
function UnitGroupSource() {
const {
preview: { tag },
preview: {
tag
}
} = (0, _MakerContext.useMakerContext)();
return /*#__PURE__*/ _react.default.createElement(
_react.default.Fragment,
null,
tag === 'section' ? /*#__PURE__*/ _react.default.createElement(_UnitGroupSection.UnitGroupSection, null) : null,
tag === 'table'
? /*#__PURE__*/ _react.default.createElement(_UnitGroupTableLayout.UnitGroupTableLayout, null)
: null
);
}
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, tag === 'section' ? /*#__PURE__*/_react.default.createElement(_UnitGroupSection.UnitGroupSection, null) : null, tag === 'table' ? /*#__PURE__*/_react.default.createElement(_UnitGroupTableLayout.UnitGroupTableLayout, null) : null);
}
29 changes: 13 additions & 16 deletions lib/components/UnitSource.js
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
'use strict';
"use strict";

var _interopRequireDefault = require('@babel/runtime/helpers/interopRequireDefault');
Object.defineProperty(exports, '__esModule', {
value: true,
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.UnitSource = UnitSource;
var _react = _interopRequireDefault(require('react'));
var _UnitSection = require('./layouts/UnitSection');
var _UnitTableLayout = require('./layouts/UnitTableLayout');
var _MakerContext = require('../store/MakerContext');
var _react = _interopRequireDefault(require("react"));
var _UnitSection = require("./layouts/UnitSection");
var _UnitTableLayout = require("./layouts/UnitTableLayout");
var _MakerContext = require("../store/MakerContext");
function UnitSource() {
const {
preview: { tag },
preview: {
tag
}
} = (0, _MakerContext.useMakerContext)();
return /*#__PURE__*/ _react.default.createElement(
_react.default.Fragment,
null,
tag === 'section' ? /*#__PURE__*/ _react.default.createElement(_UnitSection.UnitSection, null) : null,
tag === 'table' ? /*#__PURE__*/ _react.default.createElement(_UnitTableLayout.UnitTableLayout, null) : null
);
}
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, tag === 'section' ? /*#__PURE__*/_react.default.createElement(_UnitSection.UnitSection, null) : null, tag === 'table' ? /*#__PURE__*/_react.default.createElement(_UnitTableLayout.UnitTableLayout, null) : null);
}
Loading

0 comments on commit 03d8c5d

Please sign in to comment.