Skip to content

feat(feedback): New feedback button design #11641

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

Merged
merged 6 commits into from
Apr 24, 2024
Merged

feat(feedback): New feedback button design #11641

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04ce7f2
button designs
c298lee Apr 16, 2024
8a614f0
lint
c298lee Apr 16, 2024
ead7ae7
new config
c298lee Apr 17, 2024
0a2b205
Revert "new config"
c298lee Apr 19, 2024
70e56cc
PR comments
c298lee Apr 19, 2024
b9d4aa4
Merge branch 'develop' into cl/feedback-button
c298lee Apr 19, 2024
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
2 changes: 1 addition & 1 deletion packages/feedback/src/constants/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;
export const DOCUMENT = WINDOW.document;
export const NAVIGATOR = WINDOW.navigator;

export const ACTOR_LABEL = 'Report a Bug';
export const ACTOR_LABEL = { desktop: 'Report a Bug', mobile: '' };
export const CANCEL_BUTTON_LABEL = 'Cancel';
export const SUBMIT_BUTTON_LABEL = 'Send Bug Report';
export const FORM_TITLE = 'Report a Bug';
Expand Down
2 changes: 1 addition & 1 deletion packages/feedback/src/constants/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const LIGHT_THEME = {
backgroundHover: '#f6f6f7',
foreground: '#2b2233',
border: '1.5px solid rgba(41, 35, 47, 0.13)',
borderRadius: '12px',
borderRadius: '25px',
boxShadow: '0px 4px 24px 0px rgba(43, 34, 51, 0.12)',

success: '#268d75',
Expand Down
4 changes: 2 additions & 2 deletions packages/feedback/src/core/components/Actor.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export function createActorStyles(): HTMLStyleElement {
top: var(--top);
z-index: var(--z-index);

line-height: 25px;
line-height: 16px;

display: flex;
align-items: center;
Expand All @@ -26,7 +26,7 @@ export function createActorStyles(): HTMLStyleElement {
font-family: inherit;
font-size: var(--font-size);
font-weight: 600;
padding: 12px 16px;
padding: 16px;
text-decoration: none;
z-index: 9000;

Expand Down
3 changes: 2 additions & 1 deletion packages/feedback/src/core/integration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { Actor } from './components/Actor';
import { createMainStyles } from './createMainStyles';
import { sendFeedback } from './sendFeedback';
import type { OptionalFeedbackConfiguration, OverrideFeedbackConfiguration } from './types';
import { isMobile } from '../util/isMobile';

type Unsubscribe = () => void;

Expand Down Expand Up @@ -217,7 +218,7 @@ export const feedbackIntegration = (({

const autoInjectActor = (): void => {
const shadow = _createShadow(_options);
const actor = Actor({ buttonLabel: _options.buttonLabel, shadow });
const actor = Actor({ buttonLabel: (typeof _options.buttonLabel === 'object' ? (isMobile() ? _options.buttonLabel.mobile : _options.buttonLabel.desktop) : _options.buttonLabel), shadow });
const mergedOptions = mergeOptions(_options, {
onFormOpen() {
actor.removeFromDom();
Expand Down
7 changes: 7 additions & 0 deletions packages/feedback/src/util/isMobile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { NAVIGATOR } from '../constants';
/**
* Returns if it's a mobile browser
*/
export function isMobile(): boolean {
return (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(NAVIGATOR.userAgent));
}
4 changes: 2 additions & 2 deletions packages/feedback/src/util/isScreenshotSupported.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NAVIGATOR } from '../constants';
import { isMobile } from './isMobile';

/**
* Mobile browsers do not support `mediaDevices.getDisplayMedia` even though they have the api implemented
Expand All @@ -14,7 +14,7 @@ import { NAVIGATOR } from '../constants';
* https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getDisplayMedia
*/
export function isScreenshotSupported(): boolean {
if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(NAVIGATOR.userAgent)) {
if (isMobile()) {
return false;
}
if (!isSecureContext) {
Expand Down
2 changes: 1 addition & 1 deletion packages/types/src/feedback/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export interface FeedbackTextConfiguration {
/**
* The label for the Feedback widget button that opens the dialog
*/
buttonLabel: string;
buttonLabel: string | { desktop: string; mobile: string};

/**
* The label for the Feedback form cancel button that closes dialog
Expand Down