Skip to content

fix: sync upstream 1.18.3 emoji updates and align mobile emoji UI#140

Merged
Just-Insane merged 11 commits into
integrationfrom
sync/upstream-dev-2026-06-17-emoji
Jun 17, 2026
Merged

fix: sync upstream 1.18.3 emoji updates and align mobile emoji UI#140
Just-Insane merged 11 commits into
integrationfrom
sync/upstream-dev-2026-06-17-emoji

Conversation

@Just-Insane

Copy link
Copy Markdown
Collaborator

Description

Sync the latest upstream/dev (v1.18.3) into Charm and keep the upstream emoji fixes as the source of truth, then apply a small Charm-side follow-up for the remaining mobile emoji regressions.

This pulls in upstream Twemoji and emoji-list updates from SableClient#957 and the published Twemoji font work from SableClient#950 / SableClient#958, while preserving Charm-specific runtime and Tauri behavior.

Charm follow-up in this branch:

  • removes the Safari-sensitive picker glyph transform so system emoji size and baseline are consistent in the picker preview and grid
  • switches inline system/custom emoji baseline tweaks from transforms to vertical alignment so timeline rendering is more stable on mobile
  • removes the sticky sidebar offset hack from the emoji picker so category icons no longer float out of alignment on narrow mobile layouts
  • adds a parser test that exercises the refreshed emoji regex / jumbo-emoji path

Related recent Charm work: #136, #138, #139

Fixes #

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings

AI disclosure:

  • Partially AI assisted (clarify which code was AI assisted and briefly explain what it does).
  • Fully AI generated (explain what all the generated code does in moderate detail).
    This branch resolves the upstream/dev merge into Charm's integration line, keeps Charm-only package/runtime differences where they overlap with upstream, regenerates the dependency lockfile for the merged manifest, updates emoji detection to use the refreshed upstream Twemoji and emoji data, removes transform-based emoji alignment tweaks that were still causing mobile picker/timeline drift, removes the picker sidebar offset hack that was pushing category icons out of place on narrow layouts, and adds a regression test for inline/jumbo emoji handling with the updated regex path.

7w1 and others added 8 commits June 17, 2026 16:24
…ent#957)

<!-- Please read
https://github.com/SableClient/Sable/blob/dev/CONTRIBUTING.md before
submitting your pull request -->

### Description

<!-- Please include a summary of the change. Please also include
relevant motivation and context. List any dependencies that are required
for this change. -->

Title, for details on emoji changes check the sable twemoji repo.
Also updated various dependencies that have new minor versions, tried to
avoid anything that could be breaking so should be pretty safe.
Also also, updates build target to ES2022. So. Uh. Hopefully no one is
still using tech that doesn't support that? Prior to this change Vite by
default aimed to support ES2020, but safari 14 has some problems that
prevented compiling so I bumped it.

#### Type of change

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] This change requires a documentation update

### Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings

### AI disclosure:

- [ ] Partially AI assisted (clarify which code was AI assisted and
briefly explain what it does).
- [ ] Fully AI generated (explain what all the generated code does in
moderate detail).
<!-- Write any explanation required here, but do not generate the
explanation using AI!! You must prove you understand what the code in
this PR does. -->
> [!IMPORTANT]
> Merging this PR will create a new release.

## Fixes

* Fixed broken Twemoji rendering and updated emoji picker, autocomplete,
and jumbo detection for new emojis.
([SableClient#957](<SableClient#957>) by @7w1)
* Updated various dependencies.
([SableClient#957](<SableClient#957>) by @7w1)
@github-code-quality

github-code-quality Bot commented Jun 17, 2026

Copy link
Copy Markdown

Code Coverage Overview

Languages: JavaScript

JavaScript / code-coverage/vitest

The overall coverage remains at 23%, unchanged from the branch.


Updated June 17, 2026 23:47 UTC
Code Coverage is in Public Preview. Learn more and provide us with your feedback.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f1450f7088

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread pnpm-lock.yaml
Comment thread src/app/plugins/arborium/themes.ts
@github-actions

Copy link
Copy Markdown

Deploying with  Cloudflare Workers  Cloudflare Workers

Status Preview URL Commit Alias Updated (UTC)
✅ Deployment successful! https://pr-140-charm.justin-tech.workers.dev 4e1be40 pr-140 Wed, 17 Jun 2026 23:46:27 GMT

@Just-Insane Just-Insane enabled auto-merge June 17, 2026 23:48
@Just-Insane Just-Insane merged commit 2c7bf25 into integration Jun 17, 2026
14 checks passed
@Just-Insane Just-Insane deleted the sync/upstream-dev-2026-06-17-emoji branch June 17, 2026 23:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants