pages_core 3.8.1 → 3.8.2

data/app/javascript/components/Attachments/Attachment.jsx

@@ -2,8 +2,8 @@ import React from "react";
 import PropTypes from "prop-types";
 import copyToClipboard from "../../lib/copyToClipboard";
 import AttachmentEditor from "./AttachmentEditor";
-import ModalStore from "../ModalStore";
-import ToastStore from "../ToastStore";
+import ModalStore from "../../stores/ModalStore";
+import ToastStore from "../../stores/ToastStore";
 
 import { useDraggable } from "../drag";
 

data/app/javascript/components/Attachments/AttachmentEditor.jsx

@@ -1,8 +1,8 @@
 import React, { useState } from "react";
 import PropTypes from "prop-types";
 import copyToClipboard, { copySupported } from "../../lib/copyToClipboard";
-import ModalStore from "../ModalStore";
-import ToastStore from "../ToastStore";
+import ModalStore from "../../stores/ModalStore";
+import ToastStore from "../../stores/ToastStore";
 import { putJson } from "../../lib/request";
 
 export default function AttachmentEditor(props) {

data/app/javascript/components/EditableImage.jsx

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import PropTypes from "prop-types";
 import ImageEditor from "./ImageEditor";
-import ModalStore from "./ModalStore";
+import ModalStore from "../stores/ModalStore";
 
 export default function EditableImage(props) {
   const [image, setImage] = useState(props.image);

data/app/javascript/components/FileUploadButton.jsx

@@ -1,49 +1,42 @@
-import React from "react";
+import React, { useRef } from "react";
 import PropTypes from "prop-types";
 
-export default class FileUploadButton extends React.Component {
-  constructor(props) {
-    super(props);
-    this.inputRef = React.createRef();
-    this.handleChange = this.handleChange.bind(this);
-    this.triggerDialog = this.triggerDialog.bind(this);
-  }
+export default function FileUploadButton(props) {
+  const inputRef = useRef();
 
-  handleChange(evt) {
+  const handleChange = (evt) => {
     let fileList = evt.target.files;
     let files = [];
     for (var i = 0; i < fileList.length; i++) {
       files.push(fileList[i]);
     }
     if (files.length > 0) {
-      this.props.callback(files);
+      props.callback(files);
     }
-  }
+  };
 
-  render() {
-    return (
-      <div className="upload-button">
-        <span>
-          Drag and drop {this.props.type || "file"}
-          {this.props.multiple && "s"} here, or
-          {this.props.multiline && <br />}
-          <button onClick={this.triggerDialog}>
-            choose a file
-          </button>
-        </span>
-        <input type="file"
-               onChange={this.handleChange}
-               ref={this.inputRef}
-               style={{ display: "none" }}
-               multiple={this.props.multiple || false} />
-      </div>
-    );
-  }
-
-  triggerDialog(evt) {
+  const triggerDialog = (evt) => {
     evt.preventDefault();
-    this.inputRef.current.click();
-  }
+    inputRef.current.click();
+  };
+
+  return (
+    <div className="upload-button">
+      <span>
+        Drag and drop {props.type || "file"}
+        {props.multiple && "s"} here, or
+        {props.multiline && <br />}
+        <button onClick={triggerDialog}>
+          choose a file
+        </button>
+      </span>
+      <input type="file"
+             onChange={handleChange}
+             ref={inputRef}
+             style={{ display: "none" }}
+             multiple={props.multiple || false} />
+    </div>
+  );
 }
 
 FileUploadButton.propTypes = {

data/app/javascript/components/ImageEditor/Form.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import PropTypes from "prop-types";
-import ModalStore from "../ModalStore";
-import ToastStore from "../ToastStore";
+import ModalStore from "../../stores/ModalStore";
+import ToastStore from "../../stores/ToastStore";
 import copyToClipboard, { copySupported } from "../../lib/copyToClipboard";
 
 export default function Form(props) {

data/app/javascript/components/ImageEditor.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import PropTypes from "prop-types";
-import ModalStore from "./ModalStore";
+import ModalStore from "../stores/ModalStore";
 import { putJson } from "../lib/request";
 
 import ImageCropper, { useCrop, cropParams } from "./ImageCropper";

data/app/javascript/components/ImageGrid/GridImage.jsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import copyToClipboard from "../../lib/copyToClipboard";
 import EditableImage from "../EditableImage";
-import ToastStore from "../ToastStore";
+import ToastStore from "../../stores/ToastStore";
 import Placeholder from "./Placeholder";
 
 import { useDraggable } from "../drag";

data/app/javascript/components/ImageGrid.jsx

@@ -4,7 +4,7 @@ import FileUploadButton from "./FileUploadButton";
 import DragElement from "./ImageGrid/DragElement";
 import FilePlaceholder from "./ImageGrid/FilePlaceholder";
 import GridImage from "./ImageGrid/GridImage";
-import ToastStore from "./ToastStore";
+import ToastStore from "../stores/ToastStore";
 import { post } from "../lib/request";
 
 import { createDraggable,

data/app/javascript/components/ImageUploader.jsx

@@ -2,7 +2,7 @@ import React, { useState } from "react";
 import PropTypes from "prop-types";
 import EditableImage from "./EditableImage";
 import FileUploadButton from "./FileUploadButton";
-import ToastStore from "./ToastStore";
+import ToastStore from "../stores/ToastStore";
 import { post } from "../lib/request";
 
 function getFiles(dt) {

data/app/javascript/components/Modal.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import ModalStore from "./ModalStore";
+import ModalStore from "../stores/ModalStore";
 
 export default class Modal extends React.Component {
   constructor(props) {

data/app/javascript/components/Toast.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
-import ToastStore from "./ToastStore";
+import ToastStore from "../stores/ToastStore";
 
 export default class Toast extends React.Component {
   constructor(props) {

data/app/javascript/components.js

@@ -1,6 +1,7 @@
 export { default as Attachments } from "./components/Attachments";
 export { default as DateRangeSelect } from "./components/DateRangeSelect";
 export { default as EditableImage } from "./components/EditableImage";
+export { default as FileUploadButton } from "./components/FileUploadButton";
 export { default as ImageCropper } from "./components/ImageCropper";
 export { default as ImageGrid } from "./components/ImageGrid";
 export { default as ImageUploader } from "./components/ImageUploader";

data/app/javascript/index.js

@@ -31,6 +31,7 @@ export default function startPages () {
 
 export * from "./components";
 export * from "./hooks";
+export * from "./stores";
 
 export * from "./lib/request.js";
 export { default as copyToClipboard,

data/app/javascript/stores.js

@@ -0,0 +1,2 @@
+export { default as ModalStore } from "./stores/ModalStore";
+export { default as ToastStore } from "./stores/ToastStore";

data/lib/pages_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PagesCore
-  VERSION = "3.8.1" unless PagesCore.const_defined?("VERSION")
+  VERSION = "3.8.2" unless PagesCore.const_defined?("VERSION")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pages_core
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.8.2
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -621,7 +621,6 @@ files:
 - app/javascript/components/ImageGrid/Placeholder.jsx
 - app/javascript/components/ImageUploader.jsx
 - app/javascript/components/Modal.jsx
-- app/javascript/components/ModalStore.jsx
 - app/javascript/components/PageDates.jsx
 - app/javascript/components/PageFiles.jsx
 - app/javascript/components/PageImages.jsx
@@ -634,7 +633,6 @@ files:
 - app/javascript/components/TagEditor/AddTagForm.jsx
 - app/javascript/components/TagEditor/Tag.jsx
 - app/javascript/components/Toast.jsx
-- app/javascript/components/ToastStore.jsx
 - app/javascript/components/drag.js
 - app/javascript/components/drag/draggedOrder.js
 - app/javascript/components/drag/useDragCollection.js
@@ -651,6 +649,9 @@ files:
 - app/javascript/lib/copyToClipboard.js
 - app/javascript/lib/readyHandler.js
 - app/javascript/lib/request.js
+- app/javascript/stores.js
+- app/javascript/stores/ModalStore.jsx
+- app/javascript/stores/ToastStore.jsx
 - app/jobs/pages_core/autopublish_job.rb
 - app/jobs/pages_core/sweep_cache_job.rb
 - app/mailers/admin_mailer.rb