Skip to content

Commit 779dfc3

Browse files
justaleverjustalever
committed
Namespace Rails UI JS to reduce conflicts
Stimulus.js controllers were conflicting with host application JS components. This update namespaces Rails UI stimulus controllers to avoid conflcits.
1 parent ea22b9d commit 779dfc3

146 files changed

Lines changed: 1055 additions & 1178 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/assets/builds/railsui/application.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/assets/builds/railsui/application.js‎

Lines changed: 92 additions & 92 deletions
Large diffs are not rendered by default.

‎app/assets/builds/railsui/application.js.map‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/controllers/railsui/systems_controller.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ def icons
3131
@outline_icons = Dir.chdir(Rails.root.join('app/assets/images/')) do
3232
Dir.glob("icons/outline/*.svg").sort
3333
end
34-
3534
end
3635

3736
private

‎app/helpers/railsui/application_helper.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def preview(variant = nil)
140140

141141
def quick_link(title: nil, component: nil)
142142
content_tag :li do
143-
link_to title.capitalize, "##{component.parameterize}-#{title.parameterize}", class: "text-sm py-1 px-3 rounded font-medium inline-block bg-white border border-slate-300 hover:shadow-sm hover:border-slate-400 dark:border-slate-700 dark:bg-slate-800 dark:hover:border-slate-600 dark:hover:bg-slate-700/80 transition ease-in-out duration-200", data: { action: "click->smooth#scroll" }
143+
link_to title.capitalize, "##{component.parameterize}-#{title.parameterize}", class: "text-sm py-1 px-3 rounded font-medium inline-block bg-white border border-slate-300 hover:shadow-sm hover:border-slate-400 dark:border-slate-700 dark:bg-slate-800 dark:hover:border-slate-600 dark:hover:bg-slate-700/80 transition ease-in-out duration-200", data: { action: "click->railsui-smooth#scroll" }
144144
end
145145
end
146146

@@ -185,8 +185,8 @@ def example
185185
def component_link(name, href)
186186
content_tag :li do
187187
link_to name, href, class: "block py-0.5 text-neutral-500 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-white truncate", data: {
188-
action: "click->smooth#scroll",
189-
scroll_spy_target: "link"
188+
action: "click->railsui-smooth#scroll",
189+
railsui_scroll_spy_target: "link"
190190
}
191191
end
192192
end

‎app/javascript/controllers/index.js‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,70 @@
11
import { application } from "./application"
22

3-
import AnchorController from "./anchor_controller.js"
4-
application.register("anchor", AnchorController)
3+
import RailsuiAnchorController from "./railsui_anchor_controller.js"
4+
application.register("railsui-anchor", RailsuiAnchorController)
55

6-
import ClipboardController from "./clipboard_controller.js"
7-
application.register("clipboard", ClipboardController)
6+
import RailsuiClipboardController from "./railsui_clipboard_controller.js"
7+
application.register("railsui-clipboard", RailsuiClipboardController)
88

9-
import ConfigurationController from "./configuration_controller.js"
10-
application.register("configuration", ConfigurationController)
9+
import RailsuiConfigurationController from "./railsui_configuration_controller.js"
10+
application.register("railsui-configuration", RailsuiConfigurationController)
1111

12-
import CodeController from "./code_controller.js"
13-
application.register("code", CodeController)
12+
import RailsuiCodeController from "./railsui_code_controller.js"
13+
application.register("railsui-code", RailsuiCodeController)
1414

15-
import CanvasController from "./canvas_controller.js"
16-
application.register("canvas", CanvasController)
15+
import RailsuiCanvasController from "./railsui_canvas_controller.js"
16+
application.register("railsui-canvas", RailsuiCanvasController)
1717

18-
import DateRangePickerController from "./date_range_picker_controller.js"
19-
application.register("date-range-picker", DateRangePickerController)
18+
import RailsuiDateRangePickerController from "./railsui_date_range_picker_controller.js"
19+
application.register("railsui-date-range-picker", RailsuiDateRangePickerController)
2020

21-
import DialogController from "./dialog_controller.js"
22-
application.register("dialog", DialogController)
21+
import RailsuiDialogController from "./railsui_dialog_controller.js"
22+
application.register("railsui-dialog", RailsuiDialogController)
2323

24-
import DropdownController from "./dropdown_controller.js"
25-
application.register("dropdown", DropdownController)
24+
import RailsuiDropdownController from "./railsui_dropdown_controller.js"
25+
application.register("railsui-dropdown", RailsuiDropdownController)
2626

27-
import FlashController from "./flash_controller.js"
28-
application.register("flash", FlashController)
27+
import RailsuiFlashController from "./railsui_flash_controller.js"
28+
application.register("railsui-flash", RailsuiFlashController)
2929

30-
import HelperController from "./helper_controller.js"
31-
application.register("helper", HelperController)
30+
import RailsuiHelperController from "./railsui_helper_controller.js"
31+
application.register("railsui-helper", RailsuiHelperController)
3232

33-
import ModalController from "./modal_controller.js"
34-
application.register("modal", ModalController)
33+
import RailsuiModalController from "./railsui_modal_controller.js"
34+
application.register("railsui-modal", RailsuiModalController)
3535

36-
import NavController from "./nav_controller.js"
37-
application.register("nav", NavController)
36+
import RailsuiNavController from "./railsui_nav_controller.js"
37+
application.register("railsui-nav", RailsuiNavController)
3838

39-
import PreventController from "./prevent_controller.js"
40-
application.register("prevent", PreventController)
39+
import RailsuiPreventController from "./railsui_prevent_controller.js"
40+
application.register("railsui-prevent", RailsuiPreventController)
4141

42-
import ScrollController from "./scroll_controller.js"
43-
application.register("scroll", ScrollController)
42+
import RailsuiScrollController from "./railsui_scroll_controller.js"
43+
application.register("railsui-scroll", RailsuiScrollController)
4444

45-
import ScrollSpyController from "./scroll_spy_controller.js"
46-
application.register("scroll-spy", ScrollSpyController)
45+
import RailsuiScrollSpyController from "./railsui_scroll_spy_controller.js"
46+
application.register("railsui-scroll-spy", RailsuiScrollSpyController)
4747

48-
import SearchController from "./search_controller.js"
49-
application.register("search", SearchController)
48+
import RailsuiSearchController from "./railsui_search_controller.js"
49+
application.register("railsui-search", RailsuiSearchController)
5050

51-
import SelectAllController from "./select_all_controller.js"
52-
application.register("select-all", SelectAllController)
51+
import RailsuiSelectAllController from "./railsui_select_all_controller.js"
52+
application.register("railsui-select-all", RailsuiSelectAllController)
5353

54-
import SmoothController from "./smooth_controller.js"
55-
application.register("smooth", SmoothController)
54+
import RailsuiSmoothController from "./railsui_smooth_controller.js"
55+
application.register("railsui-smooth", RailsuiSmoothController)
5656

57-
import SnippetController from "./snippet_controller.js"
58-
application.register("snippet", SnippetController)
57+
import RailsuiSnippetController from "./railsui_snippet_controller.js"
58+
application.register("railsui-snippet", RailsuiSnippetController)
5959

60-
import TabsController from "./tabs_controller.js"
61-
application.register("tabs", TabsController)
60+
import RailsuiTabsController from "./railsui_tabs_controller.js"
61+
application.register("railsui-tabs", RailsuiTabsController)
6262

63-
import PagesController from "./pages_controller.js"
64-
application.register("pages", PagesController)
63+
import RailsuiPagesController from "./railsui_pages_controller.js"
64+
application.register("railsui-pages", RailsuiPagesController)
6565

66-
import ToggleController from "./toggle_controller.js"
67-
application.register("toggle", ToggleController)
66+
import RailsuiToggleController from "./railsui_toggle_controller.js"
67+
application.register("railsui-toggle", RailsuiToggleController)
6868

69-
import TooltipController from "./tooltip_controller.js"
70-
application.register("tooltip", TooltipController)
69+
import RailsuiTooltipController from "./railsui_tooltip_controller.js"
70+
application.register("railsui-tooltip", RailsuiTooltipController)

app/javascript/controllers/anchor_controller.js renamed to app/javascript/controllers/railsui_anchor_controller.js

File renamed without changes.

app/javascript/controllers/auto_expand_text_area_controller.js renamed to app/javascript/controllers/railsui_auto_expand_text_area_controller.js

File renamed without changes.

app/javascript/controllers/canvas_controller.js renamed to app/javascript/controllers/railsui_canvas_controller.js

File renamed without changes.

app/javascript/controllers/clipboard_controller.js renamed to app/javascript/controllers/railsui_clipboard_controller.js

File renamed without changes.

0 commit comments

Comments
 (0)