Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove sortable drag handle on mobile device #331

Merged
merged 1 commit into from
Dec 28, 2023
Merged

Remove sortable drag handle on mobile device #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base
include Pagy::Backend
include SessionsHelper

helper_method :native_app?, :need_transcode?, :render_flash
helper_method :native_app?, :need_transcode?, :render_flash, :mobile?

before_action :find_current_session
before_action :find_current_request_details
Expand Down Expand Up @@ -78,6 +78,10 @@ def render_flash(type: :success, message: "")
turbo_stream.update "turbo-flash", partial: "shared/flash"
end

def mobile?
browser.device.mobile?
end

private

def find_current_session
Expand Down
7 changes: 5 additions & 2 deletions app/javascript/controllers/playlist_sortable_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { fetchRequest } from '../helper'
import { installEventHandler } from './mixins/event_handler'

export default class extends Controller {
DRAG_HANDLE_SELECTOR = '.js-playlist-sortable-item-handle'

initialize () {
installEventHandler(this)
}
Expand Down Expand Up @@ -47,7 +49,7 @@ export default class extends Controller {
}

#handleMouseDown = (event) => {
const handle = event.target.closest('.js-playlist-sortable-item-handle')
const handle = event.target.closest(this.DRAG_HANDLE_SELECTOR)

if (handle) {
this.dragHandle = handle
Expand All @@ -58,8 +60,9 @@ export default class extends Controller {

#handleDragStart = (event) => {
const target = event.target
const handleExists = target.querySelector(this.DRAG_HANDLE_SELECTOR)

if (!target.draggable || !target.contains(this.dragHandle)) {
if (!target.draggable || (handleExists && !target.contains(this.dragHandle))) {
event.preventDefault()
return
}
Expand Down
4 changes: 3 additions & 1 deletion app/views/current_playlist/songs/_song.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
data-test-id='current_playlist_song'>

<div class='o-flex o-flex--align-center u-py-narrow'>
<button class='c-button c-button--icon js-playlist-sortable-item-handle u-mr-narrow' data-test-id='playlist_song_sortable_handle'><%= icon_tag "drag-indicator", size: "small" %></button>
<% unless mobile? %>
<button class='c-button c-button--icon js-playlist-sortable-item-handle u-mr-narrow' data-test-id='playlist_song_sortable_handle'><%= icon_tag "drag-indicator", size: "small" %></button>
<% end %>

<button class='c-button c-button--link o-flex__item--grow-1' data-delegated-action='current-playlist-songs#play'>
<div class='o-flex o-flex--justify-between o-flex--align-center'>
Expand Down
5 changes: 4 additions & 1 deletion app/views/playlists/songs/_song.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<li id='<%= "#{dom_id(playlist)}_#{dom_id(song)}" %>' class='c-list__item u-p-0' data-playlist-songs-target='item' data-song-id='<%= song.id %>' data-test-id='playlist_song' draggable='true'>
<div class='o-flex o-flex--align-center u-py-narrow'>
<button class='c-button c-button--icon js-playlist-sortable-item-handle u-mr-narrow' data-test-id='playlist_song_sortable_handle'><%= icon_tag "drag-indicator", size: "small" %></button>
<% unless mobile? %>
<button class='c-button c-button--icon js-playlist-sortable-item-handle u-mr-narrow' data-test-id='playlist_song_sortable_handle'><%= icon_tag "drag-indicator", size: "small" %></button>
<% end %>

<%= button_to(
current_playlist_songs_path(song_id: song.id, should_play: true),
class: "c-button c-button--link u-w-100",
Expand Down