Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Restructure pattern input

Jan Sandbrinkbad555e217ad
diff --git a/app/components/work_package_types/pattern_input.html.erb b/app/components/work_package_types/pattern_input.html.erb
index 2b2f98649d7..818b578ac1b 100644
--- a/app/components/work_package_types/pattern_input.html.erb
+++ b/app/components/work_package_types/pattern_input.html.erb
@@ -30,7 +30,7 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render(
FormControl.new(
- input: @input,
+ input:,
classes: "op-pattern-input",
"data-controller": "pattern-input",
"data-pattern-input-pattern-initial-value": @value,
@@ -40,7 +40,7 @@ See COPYRIGHT and LICENSE files for more details.
) do
%>
<%= content_tag(:div, **@field_wrap_arguments) do %>
- <%= @input.builder.hidden_field(name, value: @value, data: { "pattern-input-target": "formInput" }) %>
+ <%= input.builder.hidden_field(name, value: @value, data: { "pattern-input-target": "formInput" }) %>
<template data-pattern-input-target="tokenTemplate">
<%= render(Primer::Beta::Label.new(tag: :span, scheme: :accent, data: { role: :token, prop: "__placeholder" })) %>
@@ -94,14 +94,15 @@ See COPYRIGHT and LICENSE files for more details.
Primer::BaseComponent.new(
tag: :div,
contenteditable: true,
- border: true, border_radius: 2, p: 1, classes: "op-pattern-input--text-field",
- "data-pattern-input-target": "content",
+ border: true, border_radius: 2, p: 1,
+ classes: "op-pattern-input--text-field",
data: {
action: "keydown->pattern-input#input_keydown
input->pattern-input#input_change
mouseup->pattern-input#input_mouseup
focus->pattern-input#input_focus
- blur->pattern-input#input_blur"
+ blur->pattern-input#input_blur",
+ "pattern-input-target": "content",
}
)
)
diff --git a/app/components/work_package_types/pattern_input.rb b/app/components/work_package_types/pattern_input.rb
index e65b5404ad8..ecc2de7e45b 100644
--- a/app/components/work_package_types/pattern_input.rb
+++ b/app/components/work_package_types/pattern_input.rb
@@ -32,7 +32,9 @@ module WorkPackageTypes
class PatternInput < Primer::Forms::BaseComponent
prepend Primer::OpenProject::Forms::WrappedInput
- delegate :name, to: :@input
+ attr_reader :input
+
+ delegate :name, to: :input
def initialize(input:, value:, suggestions:)
super()