pageflow 17.1.0 → 17.2.0

data/app/assets/stylesheets/pageflow/ui/color_picker.scss

@@ -0,0 +1,230 @@
+.color_picker {
+  --thumb: #{size(4)};
+
+  display: none;
+  position: absolute;
+  width: size(48);
+  z-index: 1000;
+  border-radius: rounded("base");
+  background-color: var(--ui-surface-color);
+  box-shadow: 0 0 0 1px var(--ui-on-surface-color-lightest), var(--ui-box-shadow-lg);
+  user-select: none;
+
+  &-open {
+    display: block;
+  }
+
+  &-gradient {
+    position: relative;
+    width: 100%;
+    height: size(24);
+    margin-bottom: size(3);
+    border-radius: rounded("base") rounded("base") 0 0;
+    background-image: #{"linear-gradient(rgba(0,0,0,0), #000), linear-gradient(90deg, #fff, currentColor)"};
+    cursor: pointer;
+  }
+
+  &-marker {
+    position: absolute;
+    width: size(3);
+    height: size(3);
+    margin: size(-1.5) 0 0 size(-1.5);
+    border: 1px solid #fff;
+    border-radius: 50%;
+    background-color: currentColor;
+    cursor: pointer;
+
+    &:focus {
+      outline: none;
+    }
+  }
+
+  input[type="range"] {
+    &::-webkit-slider-runnable-track {
+      width: 100%;
+      height: var(--thumb);
+    }
+
+    &::-webkit-slider-thumb {
+      width: var(--thumb);
+      height: var(--thumb);
+      -webkit-appearance: none;
+    }
+
+    &::-moz-range-track {
+      width: 100%;
+      height: var(--thumb);
+      border: 0;
+    }
+
+    &::-moz-range-thumb {
+      width: var(--thumb);
+      height: var(--thumb);
+      border: 0;
+    }
+  }
+
+  &-hue {
+    background-image: #{"linear-gradient(to right, #f00 0%, #ff0 16.66%, #0f0 33.33%, #0ff 50%, #00f 66.66%, #f0f 83.33%, #f00 100%)"};
+  }
+
+  &-hue,
+  &-alpha {
+    position: relative;
+    height: size(2);
+    margin: size(3) size(4);
+    border-radius: rounded("base");
+  }
+
+  &-alpha span {
+    display: block;
+    height: 100%;
+    width: 100%;
+    border-radius: inherit;
+    background-image: #{"linear-gradient(90deg, rgba(0,0,0,0), currentColor)"};
+  }
+
+  &-hue input[type="range"],
+  &-alpha input[type="range"] {
+    position: absolute;
+    width: calc(100% + 2 * var(--thumb));
+    height: var(--thumb);
+    left: calc(-1 * var(--thumb));
+    top: calc((#{size(2)} - var(--thumb)) / 2);
+    margin: 0;
+    background-color: transparent;
+    opacity: 0;
+    cursor: pointer;
+    appearance: none;
+    -webkit-appearance: none;
+  }
+
+  &-hue div,
+  &-alpha div {
+    position: absolute;
+    width: var(--thumb);
+    height: var(--thumb);
+    left: 0;
+    top: 50%;
+    margin-left: calc(var(--thumb) / -2);
+    transform: translateY(-50%);
+    border: 2px solid #fff;
+    border-radius: 50%;
+    background-color: currentColor;
+    pointer-events: none;
+  }
+
+  &-swatches {
+    margin: 0 size(4);
+    border-top: 1px solid var(--ui-on-surface-color-lightest);
+    display: flex;
+    flex-wrap: wrap;
+    gap: size(2);
+    padding: size(3) 0;
+
+    &.color_picker-empty {
+      display: none;
+    }
+
+    .color_picker-swatch_divider {
+      flex-basis: 100%;
+      height: 0;
+      margin: size(1) 0;
+      border-top: 1px solid var(--ui-on-surface-color-lightest);
+    }
+
+    button {
+      position: relative;
+      width: size(5);
+      height: size(5);
+      padding: 0;
+      border: 0;
+      border-radius: 50%;
+      color: inherit;
+      text-indent: -1000px;
+      white-space: nowrap;
+      overflow: hidden;
+      cursor: pointer;
+
+      &:after {
+        content: '';
+        display: block;
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        left: 0;
+        top: 0;
+        border-radius: inherit;
+        background-color: currentColor;
+        box-shadow: inset 0 0 0 1px rgba(0,0,0,.1);
+      }
+    }
+  }
+
+  &-marker,
+  &-hue div,
+  &-alpha div {
+    box-sizing: border-box;
+    box-shadow: 0 0 0 1px inset var(--ui-on-surface-color-lighter), 0 0 0 1px var(--ui-on-surface-color-lighter);
+  }
+
+  &-field {
+    display: inline-block;
+    position: relative;
+    color: transparent;
+
+    > input {
+      margin: 0;
+      direction: ltr;
+    }
+
+    > span {
+      position: absolute;
+      width: size(8);
+      height: 100%;
+      right: 0;
+      top: 50%;
+      transform: translateY(-50%);
+      margin: 0;
+      padding: 0;
+      border: 0;
+      color: inherit;
+      text-indent: -1000px;
+      white-space: nowrap;
+      overflow: hidden;
+      pointer-events: none;
+
+      &:after {
+        content: '';
+        display: block;
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        left: 0;
+        top: 0;
+        border-radius: inherit;
+        background-color: currentColor;
+        box-shadow: inset 0 0 0 1px var(--ui-on-surface-color-lighter);
+      }
+    }
+  }
+
+  &-alpha,
+  &-swatches button,
+  &-field > span {
+    background-image: #{"repeating-linear-gradient(45deg, #aaa 25%, transparent 25%, transparent 75%, #aaa 75%, #aaa), repeating-linear-gradient(45deg, #aaa 25%, #fff 25%, #fff 75%, #aaa 75%, #aaa)"};
+    background-position: 0 0, size(1) size(1);
+    background-size: size(2) size(2);
+  }
+
+  &-keyboard_nav .color_picker-marker:focus,
+  &-keyboard_nav .color_picker-hue input:focus + div,
+  &-keyboard_nav .color_picker-alpha input:focus + div {
+    outline: none;
+    box-shadow: 0 0 0 2px var(--ui-selection-color), 0 0 2px 2px #fff;
+  }
+
+  &-no_alpha .color_picker-alpha {
+    display: none;
+  }
+}

data/app/assets/stylesheets/pageflow/ui/forms.scss

@@ -33,7 +33,10 @@ textarea,
 [type="time"],
 [type="week"],
 [multiple],
-button[aria-haspopup] {
+// Listbox inputs, which headless UI renders as a button announcing a
+// generic popup. Matching the value keeps buttons that open an actual
+// menu from being turned into select lookalikes.
+button[aria-haspopup="true"] {
   font-size: 13px;
   display: block;
   width: 100%;
@@ -85,6 +88,7 @@ textarea.short {
 }
 
 .radio_input,
+.radio_button,
 .check_box_input {
   padding: space(1) 0;
   position: relative;
@@ -108,6 +112,10 @@ textarea.short {
   }
 }
 
+.radio_button {
+  padding: space(2);
+}
+
 .radio_input {
   padding-top: 10px;
 }
@@ -140,9 +148,20 @@ textarea.short {
 .slider_input {
   padding: space(1) 0 0;
 
+  label {
+    margin-bottom: space(2.5);
+  }
+
+  .slider_wrapper {
+    display: flex;
+    align-items: center;
+    gap: space(2);
+  }
+
   .slider {
-    margin: 10px 10px 0 40px;
+    flex: 1;
     border: 1px solid var(--ui-on-surface-color-lighter);
+    margin-right: 10px;
   }
 
   .ui-slider-handle {
@@ -152,8 +171,7 @@ textarea.short {
 
   .value {
     font-size: 11px;
-    margin: 7px 0;
-    float: left;
+    min-width: space(8);
   }
 
   &.disabled .slider,
@@ -227,6 +245,18 @@ textarea.short {
   display: none;
 }
 
+.visually_hidden {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  white-space: nowrap;
+  border: 0;
+}
+
 .input-disabled {
   button,
   select,

data/app/assets/stylesheets/pageflow/ui/functions.scss

@@ -1,9 +1,19 @@
 @function space($name) {
-  @return map-get($size-scale, "#{$name}");
+  @return _size-lookup($name);
 }
 
 @function size($name) {
-  @return map-get($size-scale, "#{$name}");
+  @return _size-lookup($name);
+}
+
+@function _size-lookup($name) {
+  $key: "#{$name}";
+
+  @if str-slice($key, 1, 1) == "-" {
+    @return -1 * map-get($size-scale, str-slice($key, 2));
+  }
+
+  @return map-get($size-scale, $key);
 }
 
 $size-scale: (

data/app/assets/stylesheets/pageflow/ui/input/color_input.scss

@@ -1,33 +1,26 @@
 .color_input {
-  .minicolors {
+  .color_picker-field {
     box-sizing: border-box;
     width: 100%;
   }
 
-  input {
-    padding-left: 30px;
+  .color_picker-field > input {
+    padding-left: size(8);
     width: 100%;
     height: auto;
   }
 
-  .minicolors-input-swatch {
-    top: 5px;
-    left: 5px;
-
-    .minicolors-swatch-color {
-      background-color: var(--placeholder-color);
-    }
+  .color_picker-field > span {
+    left: size(1.5);
+    width: size(5);
+    height: size(5);
   }
 
-  &.is_default input {
+  &.is_default .color_picker-field > input {
     color: var(--ui-on-surface-color-light);
   }
 
-  .minicolors-focus input {
+  .color_picker-field:focus-within > input {
     color: var(--ui-on-surface-color);
   }
-
-  .minicolors-swatches .minicolors-swatch {
-    margin: 2px;
-  }
 }

data/app/assets/stylesheets/pageflow/ui/input/text_area_input.scss

@@ -182,6 +182,21 @@
   }
 }
 
+.text_area_input.input-disabled {
+  .wysihtml5-sandbox,
+  &.text_area_input .toolbar {
+    opacity: 0.5
+  }
+
+  .dialog {
+    display: none;
+  }
+
+  .wysihtml5-command-dialog-opened {
+    margin-bottom: 0;
+  }
+}
+
 .editor .text_area_input {
   .open_in_new_tab_section .inline_help {
     display: block;

data/app/assets/stylesheets/pageflow/ui/overrides.scss

@@ -0,0 +1,8 @@
+// Override this file in your host application to customize
+// UI CSS custom properties (e.g. --ui-font-family).
+//
+// Example (in app/assets/stylesheets/pageflow/ui/overrides.scss):
+//
+//   :root {
+//     --ui-font-family: "Inter", sans-serif;
+//   }

data/app/assets/stylesheets/pageflow/ui/properties.scss

@@ -1,4 +1,17 @@
 :root { // scss-lint:disable PropertyCount
+  // Match pageflow/ui/normalize.scss which is not included in all
+  // contexts that use these properties.
+  --ui-font-family:
+    system-ui,
+    -apple-system,
+    'Segoe UI',
+    Roboto,
+    Helvetica,
+    Arial,
+    sans-serif,
+    'Apple Color Emoji',
+    'Segoe UI Emoji';
+
   --ui-font-size: 13px;
 
   --ui-surface-color: #fff;
@@ -28,6 +41,10 @@
   --ui-selection-color-lighter: hsla(197, 69%, 76%, 0.3);
   --ui-selection-color-lightest: hsla(197, 69%, 76%, 0.1);
 
+  --ui-warning-color: #ff7400;
+  --ui-warning-color-lighter: hsla(27, 100%, 50%, 0.3);
+  --ui-warning-color-lightest: hsla(27, 100%, 50%, 0.1);
+
   --ui-error-color: #ff4d6d;
   --ui-error-color-light: hsla(349, 100%, 65%, 0.6);
   --ui-error-color-lighter: hsla(349, 100%, 65%, 0.3);
@@ -42,6 +59,18 @@
   --ui-box-shadow-xl: 0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1);
   --ui-box-shadow-2xl: 0 25px 50px -12px rgb(0 0 0 / 0.25);
 
+  --ui-accent-color: #ffd24d;
+  --ui-accent-color-light: hsla(44, 100%, 65%, 0.6);
+  --ui-accent-color-lighter: hsla(44, 100%, 65%, 0.3);
+  --ui-accent-color-lightest: hsla(44, 100%, 65%, 0.1);
+  --ui-on-accent-color: #795f0f;
+
+  --ui-accent-grey-color: hsl(44, 0%, 75%);
+  --ui-accent-grey-color-light: hsla(44, 0%, 75%, 0.6);
+  --ui-accent-grey-color-lighter: hsla(44, 0%, 75%, 0.3);
+  --ui-accent-grey-color-lightest: hsla(44, 0%, 75%, 0.1);
+  --ui-on-accent-grey-color: hsl(44, 0%, 27%);
+
   --ui-on-button-color: var(--ui-primary-color);
   --ui-button-border-color: var(--ui-primary-color-light);
   --ui-button-hover-border-color: var(--ui-primary-color);

data/app/assets/stylesheets/pageflow/ui/tabs_view.scss

@@ -6,17 +6,22 @@
     border-bottom: solid 1px var(--ui-on-surface-color-lighter);
   }
 
-  &-headers {
+  &-tabs {
     white-space: nowrap;
     padding: 0;
     position: absolute;
 
-    li {
+    > button {
       display: inline-block;
-      padding: 10px 10px;
       cursor: pointer;
       color: var(--ui-on-surface-color-light);
+      padding: 10px 10px;
       height: 14px;
+      box-sizing: content-box;
+      border: none;
+      background-color: transparent;
+      line-height: inherit;
+      outline-offset: -1px;
 
       &.active {
         color: var(--ui-primary-color);

data/app/assets/stylesheets/pageflow/ui.scss

@@ -1,14 +1,16 @@
 @import "bourbon";
-@import "jquery.minicolors";
 @import "pageflow/mixins";
 
 @import "./ui/properties";
 @import "./ui/functions";
 
+@import "pageflow/ui/overrides";
+
 %pageflow-ui {
   @import "./ui/forms";
-  @import "./ui/input/file_name_input";
+  @import "./ui/color_picker";
   @import "./ui/input/color_input";
+  @import "./ui/input/file_name_input";
   @import "./ui/table_view";
   @import "./ui/table_cells/presence_table_cell";
   @import "./ui/table_cells/delete_row_table_cell";

data/app/controllers/pageflow/editor/entries_controller.rb

@@ -50,6 +50,7 @@ module Pageflow
           .permit(:title, :summary, :credits,
                   :share_url, :share_image_id, :share_image_x, :share_image_y,
                   :locale, :author, :publisher, :keywords, :theme_name,
+                  :structured_data_type_name,
                   share_providers: {})
           .merge(configuration:)
       end

data/app/controllers/pageflow/editor/file_folders_controller.rb

@@ -0,0 +1,80 @@
+module Pageflow
+  module Editor
+    # @api private
+    class FileFoldersController < Pageflow::ApplicationController
+      respond_to :json
+
+      before_action :authenticate_user!
+
+      def index
+        entry = DraftEntry.find(params[:entry_id])
+
+        authorize!(:use_files, entry.to_model)
+        @file_folders = folders(entry)
+
+        respond_with(:editor, @file_folders)
+      end
+
+      def create
+        entry = DraftEntry.find(params[:entry_id])
+        authorize!(:edit, entry.to_model)
+        verify_edit_lock!(entry)
+
+        @file_folder = entry.create_folder!(create_params)
+
+        respond_with(:editor, @file_folder)
+      rescue ActiveRecord::RecordInvalid => e
+        debug_log_with_backtrace(e)
+        head :unprocessable_entity
+      end
+
+      def update
+        entry = DraftEntry.find(params[:entry_id])
+        authorize!(:edit, entry.to_model)
+        verify_edit_lock!(entry)
+
+        folder(entry).update!(update_params)
+
+        head(:no_content)
+      rescue ActiveRecord::RecordInvalid => e
+        debug_log_with_backtrace(e)
+        head :unprocessable_entity
+      end
+
+      def destroy
+        entry = DraftEntry.find(params[:entry_id])
+        authorize!(:edit, entry.to_model)
+        verify_edit_lock!(entry)
+
+        folder = folder(entry)
+        return head(:unprocessable_entity) unless folder.empty?
+
+        folder.destroy
+
+        head(:no_content)
+      end
+
+      private
+
+      def folder(entry)
+        folders(entry).find(params[:id])
+      end
+
+      def folders(entry)
+        FileFolder.all_for_revision(entry.draft)
+      end
+
+      def create_params
+        file_folder_params.permit(:name, :parent_folder_perma_id)
+      end
+
+      def update_params
+        file_folder_params.permit(:name, :parent_folder_perma_id)
+      end
+
+      def file_folder_params
+        params.require(:file_folder)
+      end
+    end
+  end
+end

data/app/controllers/pageflow/editor/file_import_controller.rb

@@ -59,6 +59,7 @@ module Pageflow
                           :content_type,
                           :file_size,
                           :url,
+                          :folder_perma_id,
                           {configuration: [:alt, :source_url]}])
           .require(:files)
       end

data/app/controllers/pageflow/editor/files_controller.rb

@@ -31,9 +31,7 @@ module Pageflow
 
       def reuse
         entry = DraftEntry.find(params[:entry_id])
-        other_entry = DraftEntry.find(file_reuse_params[:other_entry_id])
-
-        file_reuse = FileReuse.new(entry, other_entry, file_type, file_reuse_params[:file_id])
+        file_reuse = build_file_reuse(entry)
 
         authorize!(:edit, entry.to_model)
         authorize!(:use, file_reuse.file.to_model)
@@ -76,6 +74,9 @@ module Pageflow
         file.update!(update_params)
 
         head(:no_content)
+      rescue ActiveRecord::RecordInvalid => e
+        debug_log_with_backtrace(e)
+        head :unprocessable_entity
       end
 
       def destroy
@@ -92,18 +93,26 @@ module Pageflow
       private
 
       def create_params
-        file_params.permit(:display_name, :content_type, :file_size)
+        file_params.permit(:display_name, :content_type, :file_size, :folder_perma_id)
                    .merge(file_configuration_params)
                    .merge(file_parent_file_params)
                    .merge(file_custom_params)
       end
 
+      def build_file_reuse(entry)
+        FileReuse.new(entry,
+                      DraftEntry.find(file_reuse_params[:other_entry_id]),
+                      file_type,
+                      file_reuse_params[:file_id],
+                      folder_perma_id: file_reuse_params[:folder_perma_id])
+      end
+
       def file_reuse_params
-        params.require(:file_reuse).permit(:other_entry_id, :file_id)
+        params.require(:file_reuse).permit(:other_entry_id, :file_id, :folder_perma_id)
       end
 
       def update_params
-        file_configuration_params.merge(file_params.permit(:display_name))
+        file_configuration_params.merge(file_params.permit(:display_name, :folder_perma_id))
       end
 
       def file_configuration_params

data/app/controllers/pageflow/editor/oembeds_controller.rb

@@ -0,0 +1,21 @@
+module Pageflow
+  module Editor
+    # @api private
+    class OembedsController < Pageflow::ApplicationController
+      respond_to :json
+
+      before_action :authenticate_user!
+
+      def show
+        provider = Pageflow.config.oembed_providers.find_by_name!(params[:provider])
+        oembed_response = provider.get(params[:url])
+
+        render json: oembed_response.fields
+      rescue Pageflow::OembedProviderNotFoundError
+        head :unprocessable_entity
+      rescue OEmbed::NotFound
+        head :not_found
+      end
+    end
+  end
+end